merge of 'a250ef0b1707ead866fe051ca88c56e538d51bfb'
authorJohn Lee <john_lee@openmoko.org>
Tue, 22 Jan 2008 03:52:27 +0000 (03:52 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 22 Jan 2008 03:52:27 +0000 (03:52 +0000)
     and 'c50c127687a0e35ba0e44fbfe9fbf7b23e973914'


Trivial merge