merge of 'bf8c5e1e7ed3a5da0c5093ef25679dfa347661d0'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 12:09:27 +0000 (12:09 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 12 Sep 2007 12:09:27 +0000 (12:09 +0000)
     and 'c4e2e121643a61501bd54fc8c15f73fdd313e942'


Trivial merge