merge of 791935fd8d64ea337f4c38ae545377e69b3d5ab6
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 24 Aug 2005 12:07:25 +0000 (12:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 12:07:25 +0000 (12:07 +0000)
     and ce4141d635411c5d1dd69423e1b66dfe0510d043


Trivial merge