merge of 852a5931df198c319ddd37aafce0001ae839df46
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Jul 2005 08:51:53 +0000 (08:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 08:51:53 +0000 (08:51 +0000)
commit101f43eb25f75463ab69a1b2e68959e5cd6cb659
treee1efddcf4e6235f4282beeb2fbe6bbaf570ca292
parent488c94400553be4e7bf946430a4783ee7e91f38b
parent2dd2c75e956e6352fb2c1e8ed4656cb34836d495
merge of 852a5931df198c319ddd37aafce0001ae839df46
     and e109156250767b8fafcee6f70ed990161ec858d1