merge of '8c23a90bb0b38e4ba6abafa0a16f36239f32c5c1'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 20 Sep 2007 15:14:56 +0000 (15:14 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 20 Sep 2007 15:14:56 +0000 (15:14 +0000)
     and 'dbabf68495e6b7488bb919520b8942286b4bb565'


Trivial merge