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)
     and '9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb'


Trivial merge