merge of 47d86e9a403d6513783b2b5fafbc7e4d0873f343
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Dec 2005 15:05:21 +0000 (15:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 15:05:21 +0000 (15:05 +0000)
     and 7ee5c62fc6fea21a0758652386c98049c72dce66


Trivial merge