merge of 771edb7edd8b560569a56b0e95f25a9a5685a599
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 24 Aug 2005 11:25:00 +0000 (11:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 11:25:00 +0000 (11:25 +0000)
     and b7f12e469db67fa2a88f0754895db961c1222134


Trivial merge