merge of 1a204644a2419a905a060144eb028dfcb467391a
authorKoen Kooi <koen@openembedded.org>
Tue, 23 May 2006 18:58:40 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 18:58:40 +0000 (18:58 +0000)
     and ce94922846908c2edd7362a56618ea051b244c3b


Trivial merge