merge of '397294e12f174d25745f5b3b591468ffd54fec4d'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Mon, 8 Oct 2007 18:43:37 +0000 (18:43 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Mon, 8 Oct 2007 18:43:37 +0000 (18:43 +0000)
     and 'addd0ba8bdfe80ab62ce0514efcacdb160637bf6'


Trivial merge