merge of 3d36999259540aad0864e3018cb37560232cbb86
authorKoen Kooi <koen@openembedded.org>
Fri, 9 Dec 2005 10:40:03 +0000 (10:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Dec 2005 10:40:03 +0000 (10:40 +0000)
     and d4be44886b4f04bdee851d4031e18277d8439775


Trivial merge