merge of 65ba11a9774e6d79d6e8cf86b9aa4280fb5092e4
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 17:08:23 +0000 (17:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 17:08:23 +0000 (17:08 +0000)
     and adeae08e534b3e3695bc45e3b6413729fe210c7d


Trivial merge