merge of '214ed7e892086095fb4e656e5d3777e201866e46'
authorJohn Lee <john_lee@openmoko.org>
Tue, 22 Jan 2008 04:26:10 +0000 (04:26 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 22 Jan 2008 04:26:10 +0000 (04:26 +0000)
     and '824c66fc36263bf7387bf3cac74b83506fa27024'


Trivial merge