merge of 'af3f6db370a187f22f801a7ed4bdea1061e52e32'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jul 2007 12:11:56 +0000 (12:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jul 2007 12:11:56 +0000 (12:11 +0000)
     and 'e1ad326dec67a2aaab1bc01b6d70829706bbd6c0'


Trivial merge