merge of 1d2858e7bbc771e55a5752909b283a96145ea424
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 22 Jul 2005 17:59:10 +0000 (17:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 17:59:10 +0000 (17:59 +0000)
     and bdb97a8488d4ea90ddba854e2c02a206b747fd3f


Trivial merge