merge of 'acaec69cff5e01d75fc25fc008a3647d4276e23a'
authorJohn Lee <john_lee@openmoko.org>
Fri, 1 Feb 2008 12:07:19 +0000 (12:07 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 1 Feb 2008 12:07:19 +0000 (12:07 +0000)
     and 'fbdf8a106f5161fd714dd92d53cf8bd31fa6d8ea'


Trivial merge