merge of '22b3c11cec3f962a441e5c6f686eebd66184dfa0'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 31 Aug 2007 23:36:45 +0000 (23:36 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 31 Aug 2007 23:36:45 +0000 (23:36 +0000)
     and '3f5ee415e40f92763b72400da3741a3279871d69'


Trivial merge