merge of '4c108250ef95743112aee6c23a4f206124025bbb'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Sat, 1 Sep 2007 14:50:36 +0000 (14:50 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Sat, 1 Sep 2007 14:50:36 +0000 (14:50 +0000)
     and 'd3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31'


Trivial merge