merge of d82f1294da436f4c180db853fffef16a6b811b28
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 08:12:39 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 08:12:39 +0000 (08:12 +0000)
     and d9f2b0cf0a3d1cb9bda168d3802b0398efb83db9


Trivial merge