merge of '07a74b59f4e9de4044085d427a87ec5200e7f713'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 18:46:51 +0000 (18:46 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 18:46:51 +0000 (18:46 +0000)
     and 'e5a1ea396fb7692c86910e3aeda7e14613406301'


Trivial merge