merge of '0d06ef20f42dbc757e10ca1639e06561c357d92d'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Mar 2008 12:15:58 +0000 (12:15 +0000)
committerJohn Lee <john_lee@openmoko.org>
Wed, 19 Mar 2008 12:15:58 +0000 (12:15 +0000)
     and '3497897aabefa260ab1125e79f685e5829fbf106'


Trivial merge