merge of 0d3287a95928eaa1b09e468ef501316c65f16248
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 22 Jul 2005 23:53:54 +0000 (23:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 23:53:54 +0000 (23:53 +0000)
     and bc3daa844870742c024624bb588b3a94af824c6d


Trivial merge