merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
authorJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 13:52:24 +0000 (13:52 +0000)
committerJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 13:52:24 +0000 (13:52 +0000)
     and 'a6c27719ef581b67631459a7dcb52cea53fc0ccf'


Trivial merge