merge of '9069b40ccba3d40edd8269797ab9b49024e8bdc8'
authorJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 12:53:35 +0000 (12:53 +0000)
committerJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 12:53:35 +0000 (12:53 +0000)
     and '982885ad3ab91bcc7c7f4e1ee624f2202fecf617'


Trivial merge