merge of 7a93d384016e8e1ae79f574d3c804e0a38a222e7
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 19 Aug 2005 10:44:55 +0000 (10:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Aug 2005 10:44:55 +0000 (10:44 +0000)
     and 845f932890628e6c650909f15f2585f2b763ace8


Trivial merge