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)
     and '8c1bc2522cabf9236face70bb7d76a41876d04d6'


Trivial merge