merge of 852a5931df198c319ddd37aafce0001ae839df46
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Jul 2005 08:51:53 +0000 (08:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 08:51:53 +0000 (08:51 +0000)
     and e109156250767b8fafcee6f70ed990161ec858d1


Trivial merge