merge of 3918e04d271278074bcf12fe4c07ea259cbc92b0
authorKoen Kooi <koen@openembedded.org>
Thu, 22 Sep 2005 20:08:44 +0000 (20:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 20:08:44 +0000 (20:08 +0000)
     and ba30bfad08ba6c051b42fb8b245a2323db4719d9


Trivial merge