merge of 379077a1fae1f193142e23eba34b908f1c6c7491
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jan 2006 10:54:26 +0000 (10:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 10:54:26 +0000 (10:54 +0000)
     and fe1ec31f3dd593d62186ad1c3ebd437c7df45777


Trivial merge