merge of '264e9745205926e7c94f3762950d8386479df0cf'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 11 Sep 2007 16:51:01 +0000 (16:51 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 11 Sep 2007 16:51:01 +0000 (16:51 +0000)
     and '48a8d4011f39dd0cbd78a07fec96a3778e4fd8fb'


Trivial merge