merge of 174d7040f322a50d144d696708459641e213eeec
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 22 Jul 2005 21:51:40 +0000 (21:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 21:51:40 +0000 (21:51 +0000)
     and 7451db578b00df1d8e09247d9ce5a4a05af0bdfe


Trivial merge