merge of '7ecf249aa01227cf559b984727eddf32c13c84a5'
authorJohn Lee <john_lee@openmoko.org>
Wed, 12 Mar 2008 06:18:23 +0000 (06:18 +0000)
committerJohn Lee <john_lee@openmoko.org>
Wed, 12 Mar 2008 06:18:23 +0000 (06:18 +0000)
     and 'ef249adf427bcb2b167f2fde790ed1627e901111'


Trivial merge