merge of 'af017fe79f8b912b23d5f41862d46c33df4db680'
authorJohn Lee <john_lee@openmoko.org>
Thu, 31 Jan 2008 11:02:11 +0000 (11:02 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 31 Jan 2008 11:02:11 +0000 (11:02 +0000)
     and 'e9e6d183687e379f9b185c9d71bbf26f07d9d471'


Trivial merge