merge of '3a9f43520bacb1650499c5107b1b975b193d30a1'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 22:56:45 +0000 (22:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 22:56:45 +0000 (22:56 +0000)
     and '62f0b94fbf774e8334ef6abaa6f10437a6818b68'


Trivial merge