merge of 'e57c2aac5313ef7f2859dbe9a325d8705d5d3eef'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jun 2008 00:25:24 +0000 (00:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jun 2008 00:25:24 +0000 (00:25 +0000)
     and 'f5fc316539225d7382054c92b8d6cc7f1bca9b73'


Trivial merge