merge of 514709e2adeba06a2b887310a65a6b3b440f6076
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 21:45:33 +0000 (21:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 21:45:33 +0000 (21:45 +0000)
     and bfad0d650f31d9e9a3ce8fca87a95a84218252bf


Trivial merge