merge of 'b6a14ede4103fb5456bc77a176a4df071f69f010'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Mon, 10 Sep 2007 17:10:52 +0000 (17:10 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Mon, 10 Sep 2007 17:10:52 +0000 (17:10 +0000)
     and 'b953369d620df2ede89744d1f9a6a0671cda91b2'


Trivial merge