merge of 2c175103edd16989707cafa26c364d4c836c78f1
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 5 Jul 2005 16:09:26 +0000 (16:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Jul 2005 16:09:26 +0000 (16:09 +0000)
     and 43b1e94408171373a086d665867188cd20d55740


Trivial merge