merge of '42aef61ee7960f3e8df22a2a931c9a46a49531ab'
authorJohn Lee <john_lee@openmoko.org>
Thu, 20 Dec 2007 18:45:28 +0000 (18:45 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 20 Dec 2007 18:45:28 +0000 (18:45 +0000)
commitb179e93742d55e9c9855a807b4e95c68f3467300
tree8ac0bb9836f9fa9a44586395185138a10807b7db
parentd621f09a23b6d0836aae21e19ce3f6073cd16ce4
parent446b31cf615d573a24a851a944872e03f3e00d40
Merge ... '42aef61ee7960f3e8df22a2a931c9a46a49531ab'
     and '8c1bc2522cabf9236face70bb7d76a41876d04d6'