merge of '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 11:16:56 +0000 (11:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 11:16:56 +0000 (11:16 +0000)
     and '61916fde303a24e027564cf07127b974edcf2ce8'


Trivial merge