merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 Aug 2005 00:05:50 +0000 (00:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 00:05:50 +0000 (00:05 +0000)
     and fbc9813ed42c80708764b24a8a84d5a0b58fe88d


Trivial merge