merge of 292383187b69910b92b356736312e07186f59e9d
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 6 Feb 2006 00:32:34 +0000 (00:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:32:34 +0000 (00:32 +0000)
     and 65b0cd64eeef02b789460148d6bb958749417f11


Trivial merge