merge of '6b297f40d507a619bdd7d471e82d15807c186499'
authorJohn Lee <john_lee@openmoko.org>
Thu, 13 Mar 2008 09:48:39 +0000 (09:48 +0000)
committerJohn Lee <john_lee@openmoko.org>
Thu, 13 Mar 2008 09:48:39 +0000 (09:48 +0000)
commitf41eb6f0098aefd20bd466920d25247b144b09a3
tree4e38922d53a7c0d0ef170ada4d7d916b0206aab0
parent387daf5ea29f7a0d0b44681b5d488ddc24f99144
parent1345aed3f119c6fce15b815b89ac7dfad0c79cf4
Merge ... '6b297f40d507a619bdd7d471e82d15807c186499'
     and '9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb'