merge of bd296c637a24b7be6993653a2922069c43373e63
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 Aug 2005 10:49:27 +0000 (10:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 10:49:27 +0000 (10:49 +0000)
     and c9215942285997ecf417d0322c5cf0ff7542ea2b


Trivial merge