merge of 1dee375784a345fa0f5a64a238267569e93342c5
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Aug 2005 09:40:49 +0000 (09:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 09:40:49 +0000 (09:40 +0000)
     and 3aec9f1e3ffb99d10a3a1025fe75aa3bcbef3e23


Trivial merge