merge of '27a990a9e4bdc09a026f0125d6d771ab891d2156'
authorJohn Lee <john_lee@openmoko.org>
Mon, 17 Mar 2008 03:43:38 +0000 (03:43 +0000)
committerJohn Lee <john_lee@openmoko.org>
Mon, 17 Mar 2008 03:43:38 +0000 (03:43 +0000)
     and '754b0cba2322be2fda45270a756d32e5e3eedb7a'


Trivial merge