merge of 3789df83652bc5f54fcfc4a326e887c2e0194900
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Aug 2005 16:55:50 +0000 (16:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 16:55:50 +0000 (16:55 +0000)
     and 97813a7e82a8bbff7053988a6562b44e10c527ec


Trivial merge