merge of 569bea40cbdd5df22789ea7739aa76e3942c869f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Mar 2006 16:20:30 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 16:20:30 +0000 (16:20 +0000)
     and ae3c659952dd916d2d6da191c1562023c84a6423


Trivial merge