merge of 8d3e2ffe587553463ee2931a0a34ed3432e24242
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 2 Aug 2005 14:33:11 +0000 (14:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 14:33:11 +0000 (14:33 +0000)
     and e352ade7802a08469abd04dfa8426f919d07c9e6


Trivial merge