merge of 3312c8f3a63ff90c42c1a421b659e0cd17696424
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Aug 2005 17:25:25 +0000 (17:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 17:25:25 +0000 (17:25 +0000)
     and 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df


Trivial merge