merge of '6129c0fae0db59de2238bc4edb8130cfe7cddc48'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Sun, 9 Sep 2007 13:48:32 +0000 (13:48 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Sun, 9 Sep 2007 13:48:32 +0000 (13:48 +0000)
     and 'b6be8d0c408671e0b3ce69563f1c511819083ede'


Trivial merge