merge of 1e90bf9bb883c8aeccaddeaac59be01a87a31dc3
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Sep 2005 12:14:05 +0000 (12:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Sep 2005 12:14:05 +0000 (12:14 +0000)
     and 93e4964f1376f079c8cf01b587408e5385db587f


Trivial merge