merge of 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Feb 2008 18:22:31 +0000 (18:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 17 Feb 2008 18:22:31 +0000 (18:22 +0000)
     and 'd0092933b0c82a6d8470e8da03507e0e5e71529c'


Trivial merge