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)
     and b7799ca5f38be5d5b31eafe3229e04bd95f48e05


Trivial merge