merge of e456a2310df1801ba270e5aeeb453ad03c281e84
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Oct 2005 10:35:56 +0000 (10:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Oct 2005 10:35:56 +0000 (10:35 +0000)
     and f191dec734c9bc05f8d1f1f76f065339c569e9ad


Trivial merge