merge of 4c803688c12b803a4519adfc06f927ddb07199bd
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 15 Mar 2006 15:28:03 +0000 (15:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Mar 2006 15:28:03 +0000 (15:28 +0000)
     and 914aee760f72a0d88082c029fbaa360b17e7748d


Trivial merge