merge of 1259794e0c84040e49ab53241786b7c7689b69b5
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Aug 2005 09:33:22 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 09:33:22 +0000 (09:33 +0000)
     and 6f2e2d1cbff36ea646f11c263458c798a60321c8


Trivial merge