merge of '0f79b6f78930662f9b32b4435d31c155b3ea0269'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 18:46:42 +0000 (18:46 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 18:46:42 +0000 (18:46 +0000)
     and 'b2ce7bfc971ce67a16e41e21a7810b2ee2763fc6'


Trivial merge