merge of 776c1d678f47c9a56a592cc06a10d2ca9e415611
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jan 2006 17:30:27 +0000 (17:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jan 2006 17:30:27 +0000 (17:30 +0000)
     and 86dda2fd06e3964978bb4d3424cb481531b26acd


Trivial merge