merge of 0d00e27c7db6b5d464be5054298c16347f2ad046
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 6 Feb 2006 00:33:02 +0000 (00:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:33:02 +0000 (00:33 +0000)
     and fe9207286fe795f141cfced1550795b360e1e971


Trivial merge