merge of '826e3d1604a7153fbec79dbf0287cbde9dd32200'
authorJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 18:40:56 +0000 (18:40 +0000)
committerJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 18:40:56 +0000 (18:40 +0000)
     and 'e8ef8cbc778629395b3eb845590295f8c168d5c1'


Trivial merge