merge of 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 01:34:51 +0000 (01:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 01:34:51 +0000 (01:34 +0000)
     and 'ef63b228877ae1c3c905d3921b256693b1914dea'


Trivial merge