merge of '8c9fa400aa857e0110b0a702db34db034b841697'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:49 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:49 +0000 (20:57 +0000)
     and 'bba107bc97a6967bbada8d85602a9bae89002749'


Trivial merge