merge of dba8bfabcab64d08a5e0f59cab78bdb6d75b91d3
authorKoen Kooi <koen@openembedded.org>
Mon, 15 Aug 2005 17:27:16 +0000 (17:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Aug 2005 17:27:16 +0000 (17:27 +0000)
     and f8deecc63c1bd06a27fb7eea8556860c15955080


Trivial merge