merge of 5d55a16ffc837f40e87d1a7b2e6e27aebc3e1acb
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 4 Aug 2005 15:41:35 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 15:41:35 +0000 (15:41 +0000)
     and 7d3bb279e303a0c0b1062029cca8f7c619722913


Trivial merge