merge of 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Dec 2007 15:34:31 +0000 (15:34 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 19 Dec 2007 15:34:31 +0000 (15:34 +0000)
     and 'fd740dda5c7156ecf8aa35ddf9fb0f17b0e4254e'


Trivial merge