merge of 52327d72669b1260d719f07182d82ef3862c93ff
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Feb 2007 13:05:14 +0000 (13:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 7 Feb 2007 13:05:14 +0000 (13:05 +0000)
     and 708ceae60c77bb1b1888418b0f9b0c546815c653


Trivial merge