merge of 8b7c8c60a9c08d2032c5f9659b2bbdc8bb4ba7d0
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 4 Jul 2005 10:49:22 +0000 (10:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 10:49:22 +0000 (10:49 +0000)
     and e60c3e0f78936a1187fd5f10ad0ece02bd25d3bc


Trivial merge