merge of '320ea19bc463d1bf9e280cbcadba04f87a928ede'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 10 Oct 2007 10:17:41 +0000 (10:17 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 10 Oct 2007 10:17:41 +0000 (10:17 +0000)
     and 'fd564937a9d082f3ea9dd580636ab959f5d77258'


Trivial merge