merge of 0a900d63608cab0110252c20c271767fbdb6a129
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Sep 2005 11:08:53 +0000 (11:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 11:08:53 +0000 (11:08 +0000)
     and 517a459ec3a1489d819b662a44e51bffd5943300


Trivial merge