merge of 'e3cdea0b3282f44af35483b039e7a7070e4d4ecc'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 29 Aug 2007 13:41:22 +0000 (13:41 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 29 Aug 2007 13:41:22 +0000 (13:41 +0000)
     and 'fa056f4e1e3e3e49a96459c011ccfcb235a4f695'


Trivial merge