merge of 0d3287a95928eaa1b09e468ef501316c65f16248
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 00:15:01 +0000 (00:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 00:15:01 +0000 (00:15 +0000)
     and cbef9868f39475daf5757782cffc09d98cecb99d


Trivial merge