merge of cddb2bc75922196fed2e730ac6188b75cec87184
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 12 Jul 2006 22:26:22 +0000 (22:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 22:26:22 +0000 (22:26 +0000)
     and d09f0621b4e183654539b5e69434b52a32e26b72


Trivial merge