merge of 24e85069eaef121ddb29e2dc3539a98c5ab3b6aa
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Aug 2005 23:01:28 +0000 (23:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 23:01:28 +0000 (23:01 +0000)
     and 978b81b24a21690b8a090d704ca40512790ad868


Trivial merge