merge of 7cbb3ccbaa04f56674778282d171edc3a8768a03
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 9 May 2006 20:24:21 +0000 (20:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 20:24:21 +0000 (20:24 +0000)
     and ef9a174e11d467426c07d4dbdc2228657fffd132


Trivial merge