merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Aug 2005 17:45:33 +0000 (17:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 17:45:33 +0000 (17:45 +0000)
     and c8b23fec424bb3ca1ac0a1bd18733a393d83a900


Trivial merge