merge of '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 19:01:20 +0000 (19:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 19:01:20 +0000 (19:01 +0000)
     and 'c60a4268168f4df8d07b333ec16af3ae2aed261f'


Trivial merge