merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:27:38 +0000 (11:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:27:38 +0000 (11:27 +0000)
     and 'dc3cf7cacd8aa259dc0e068dd6a8035ad9817f47'


Trivial merge