merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Aug 2005 17:00:41 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 17:00:41 +0000 (17:00 +0000)
     and 8746aa49b2d44b03e77f44c96aaab655c6477034


Trivial merge