merge of 095485c13d43cfd2d416d2dd5827fd20d2f21c51
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 24 Apr 2006 15:53:25 +0000 (15:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 15:53:25 +0000 (15:53 +0000)
     and f0f7c07492861973e86b3e409efdcb411a4fd09e


Trivial merge