merge of '2a756f49ef9a6de324943156680c1c3d212d3c67'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 31 Aug 2007 11:24:37 +0000 (11:24 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 31 Aug 2007 11:24:37 +0000 (11:24 +0000)
     and '735f3c43779c6bb86bf56348224572500e84c3c4'


Trivial merge