merge of 209a6256e96743750d5150f593397ed7477dc5db
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 7 Oct 2005 11:51:40 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 11:51:40 +0000 (11:51 +0000)
     and 3c33d888995094342e9d3851eaa77d55522bec89


Trivial merge