merge of '20657a67dd3d46190016de2069fb77e48b12f0b9'
authorJohn Lee <john_lee@openmoko.org>
Fri, 29 Feb 2008 13:13:00 +0000 (13:13 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 29 Feb 2008 13:13:00 +0000 (13:13 +0000)
     and '3d4d513f672a93f1547b3a1f5288ad83d6fc141b'


Trivial merge