merge of 160027e459479e16ccb9e2adf9a086fd90ac1468
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 3 Aug 2005 14:38:42 +0000 (14:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 14:38:42 +0000 (14:38 +0000)
     and 4fe48134c142abde40ddd2becfe6af4c646c5e00


Trivial merge