merge of '3c5eeab152463150e763af8e2364e135eabc995b'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:26:28 +0000 (14:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:26:28 +0000 (14:26 +0000)
     and '927230fdadc85c2a14f2f4ee848fe29c94d9ffe1'


Trivial merge