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


Trivial merge