merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 18:23:30 +0000 (18:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 18:23:30 +0000 (18:23 +0000)
commit017b42a2a426c816780af98c28b30d3bfb3c67e6
tree0e41f9332bfdc40539f648a6cf875805d692a164
parentc61d02e4a650528e70945aa362a76450feb2c1c5
parent900015f63bd5445f2895ded7b6972026528f29cb
merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
     and 8bed42c6d1a57ad595de378d393b40c7bd3e997f