merge of b20c3c5a8f28ed4e47ac9afd5626ef9138ad0c95
authorMichael Lauer <mickey@vanille-media.de>
Tue, 29 Aug 2006 13:50:13 +0000 (13:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 29 Aug 2006 13:50:13 +0000 (13:50 +0000)
commit82eed0ff80f86d1b78c8c0ce06fa0689a81be555
tree244cd59f68c4580aa4912d1717edf19ed9ddd50d
parent9a45407127c761f0740f0c26a5995ee99e09a42f
parent51497027c61550d72a994ad3161e45f66e8a81bd
merge of b20c3c5a8f28ed4e47ac9afd5626ef9138ad0c95
     and b7799ca5f38be5d5b31eafe3229e04bd95f48e05