merge of '81ef71fa69009396b145139571c2cbaa3855d705'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 00:38:21 +0000 (00:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 00:38:21 +0000 (00:38 +0000)
     and 'e5e89d63d424e7df2e0ca809c9cfd4220f57efaa'


Trivial merge