merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 08:21:25 +0000 (08:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 08:21:25 +0000 (08:21 +0000)
     and 'cbec50f53eb6e573a76ee660b0607c64d3e95d99'


Trivial merge