merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 3 Aug 2005 17:47:30 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 17:47:30 +0000 (17:47 +0000)
     and 83403a57c1ba58c63ed272bbb6ca23babd62ba37


Trivial merge