merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 16 Feb 2006 23:06:02 +0000 (23:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Feb 2006 23:06:02 +0000 (23:06 +0000)
     and 96f792c135e95ff503266e442db17ede3ba27060


Trivial merge