merge of 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 13:18:34 +0000 (13:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 13:18:34 +0000 (13:18 +0000)
     and 'e73a25058e540cd7bb73833d96eb62b9a797b637'


Trivial merge