merge of 0dcf135f8174d6cb8b709f2104158f5de5fa769d
authorKoen Kooi <koen@openembedded.org>
Mon, 6 Feb 2006 09:02:33 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 09:02:33 +0000 (09:02 +0000)
     and 6e0b7038969c91f76744d47455957a8284414e7d


Trivial merge