merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
authorJohn Lee <john_lee@openmoko.org>
Thu, 17 Jan 2008 09:19:46 +0000 (09:19 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 17 Jan 2008 09:19:46 +0000 (09:19 +0000)
     and '65fbfb9dd8770a45ce93446888e70c955e6b11d1'


Trivial merge