merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 19 Jul 2008 12:08:56 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 19 Jul 2008 12:08:56 +0000 (12:08 +0000)
     and 'f9f4aeef69ea9d929a612c025e1e90a2de52faca'


Trivial merge