merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
authorKoen Kooi <koen@openembedded.org>
Tue, 4 Jul 2006 17:42:49 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 17:42:49 +0000 (17:42 +0000)
     and f69ed55f40216d16d8f1cb7559d13b46385991b2


Trivial merge