merge of '715411a278a0c3f0aa1f31adfd5cd77fd9d730d5'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 28 Aug 2007 12:23:48 +0000 (12:23 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 28 Aug 2007 12:23:48 +0000 (12:23 +0000)
     and '95e88a1838246f2647083a1824d4136e4b3f2073'


Trivial merge