merge of 2c9a9f52d7a84d26b72104dfc968f2430ae26091
authorMichael Lauer <mickey@vanille-media.de>
Sun, 31 Jul 2005 17:57:49 +0000 (17:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 17:57:49 +0000 (17:57 +0000)
     and bda34a3079d192cc0342b04ecd99d52fdbe2f633


Trivial merge