merge of 'b41b2179eb6432d9e607dc4b3056424946bb8c66'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 15:27:58 +0000 (15:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 15:27:58 +0000 (15:27 +0000)
     and 'ee585ae1d7dbac814d0d2c450e80ef5eb5673366'


Trivial merge