merge of '17052bfd7be914a890ec54d73c91df769727c7db'
authorJohn Lee <john_lee@openmoko.org>
Fri, 14 Mar 2008 05:56:07 +0000 (05:56 +0000)
committerJohn Lee <john_lee@openmoko.org>
Fri, 14 Mar 2008 05:56:07 +0000 (05:56 +0000)
     and '8e540d3afdaf92d4b67de7855fe900164a9a3c69'


Trivial merge