merge of 6de86d14a70c1fff678e2d61e0d87e5bb56444ef
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Jul 2006 12:04:54 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 12:04:54 +0000 (12:04 +0000)
     and edd37393c94a6f987d935aa89ae084b99c41d5d5


Trivial merge