merge of '66118fcaf02332902350af917b57b972df319ac9'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:05 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:05 +0000 (20:57 +0000)
     and '8eb6b233aceb83e6c40ddd88e0b223a6c8eb85ab'


Trivial merge