merge of f5dd78fd37750576d502b8124f093d45ca992ca6
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 21 Jul 2005 14:21:28 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 14:21:28 +0000 (14:21 +0000)
     and f9869d372bd0705706ba5562f7a5b7bb25208ff3


Trivial merge