merge of bc8ebabb26be6b1995dede187f84d76cb364c344
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Aug 2005 13:36:09 +0000 (13:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 13:36:09 +0000 (13:36 +0000)
commite290814b9fb3e6712a82cad3695787c2833249f4
tree13637a80440eb4d48db5454c8dc1fca9f7bc8ef7
parentbcd1a806faaf20c16b1fff5e3a203e94a3d32208
parent2d71149d3d65bdefcea2a6ecfdaa6b3c3e3bd5ff
merge of bc8ebabb26be6b1995dede187f84d76cb364c344
     and de31bae9925b81f8c7cff9b208bebeffced17654