merge of '35db89c4b3d1eaa8c0f4b1effd258962748ac7d0'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 7 Mar 2008 12:48:29 +0000 (12:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 7 Mar 2008 12:48:29 +0000 (12:48 +0000)
     and 'e864291685ba1a24984c6960efae35c98c88d0b8'


Trivial merge