merge of '4d03f56302a38e79c12327695f01f27a836720ec'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Dec 2007 15:34:51 +0000 (15:34 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 19 Dec 2007 15:34:51 +0000 (15:34 +0000)
     and '6e585903810d19bd09a43d9293b04df368f0c308'


Trivial merge