merge of 5542410cebc875e7fa0cf7df43f77e83dd815ae4
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Mar 2006 19:14:02 +0000 (19:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 19:14:02 +0000 (19:14 +0000)
     and acaca3acef59ac42500f2bf124eaed2619fa5046


Trivial merge