merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
authorJohn Lee <john_lee@openmoko.org>
Wed, 23 Jan 2008 04:05:57 +0000 (04:05 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 23 Jan 2008 04:05:57 +0000 (04:05 +0000)
     and 'a22503624f899a2e28116f2ca9acb54520778734'


Trivial merge