merge of '766789e16c4588dfab5b71e8da5a30e6077b82f1'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 20 Sep 2007 15:48:34 +0000 (15:48 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 20 Sep 2007 15:48:34 +0000 (15:48 +0000)
     and 'ea8da631edaa0acc4a189373ea7ccadc3bf034c3'


Trivial merge