merge of '376819ac84d75f0ce8ec06340963023a9c9942a4'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 29 Aug 2007 23:09:15 +0000 (23:09 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 29 Aug 2007 23:09:15 +0000 (23:09 +0000)
     and '60fb33a02ef3883ba5e899817c59b6eb330776e0'


Trivial merge