merge of 'b40ff574864609e2e568aaadd2819286b3608596'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 14:33:55 +0000 (14:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 14:33:55 +0000 (14:33 +0000)
     and 'ea02b45427ce0c5be80c8d3e8e927a9d71168320'


Trivial merge