merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 20 Jul 2005 17:36:56 +0000 (17:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 17:36:56 +0000 (17:36 +0000)
     and a073097d84a515599a3c0d13bd06d0e9cc9beded


Trivial merge