merge of d161fb82f9d1ec0a546a8c69497c077f271e3659
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 1 Aug 2005 10:14:05 +0000 (10:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 10:14:05 +0000 (10:14 +0000)
     and d92544c17e3d96c540fd722492b3abde4b91c2f6


Trivial merge