merge of 'a713e30a7c1eae8ab3bf00e2e3eb7f9a6ffb1e3b'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 30 Aug 2007 23:12:51 +0000 (23:12 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 30 Aug 2007 23:12:51 +0000 (23:12 +0000)
     and 'd8e98da9ed9defada9c57a74483bcdc055b3524e'


Trivial merge