merge of 059e51f284488d43836324f6cfbc2d76b6d919c9
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Apr 2006 16:56:30 +0000 (16:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Apr 2006 16:56:30 +0000 (16:56 +0000)
     and d0b3b64609328efd34da7b4029169e4d92f782fc


Trivial merge