merge of 35ce256593987e71d7c04247837a04f2dfaea425
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 May 2006 12:07:55 +0000 (12:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 May 2006 12:07:55 +0000 (12:07 +0000)
     and c973ff55ff1f4aa31763966c5b65965b1da3e903


Trivial merge