merge of '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 16:24:25 +0000 (16:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 16:24:25 +0000 (16:24 +0000)
     and 'dd270d37a9758c7acdca59383935fd9cadad3aa8'


Trivial merge