merge of 309baf9561eba78495d1b59322a8ebca28e571bc
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 17:05:34 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 17:05:34 +0000 (17:05 +0000)
     and 9493767780c108c1eb032fd49a0a9898244577b9


Trivial merge