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)
commit14f64d1932814031355e086ad2e958d8888187f1
treee93926df758616281f62709169d569601778a25f
parentd3c6a5e7b9480d131965ecaede1f9eb7e94fac1b
parent144f11fc04855f84c482a5a5c5081ae7cb391e88
merge of bd296c637a24b7be6993653a2922069c43373e63
     and c9215942285997ecf417d0322c5cf0ff7542ea2b