merge of '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:35 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:35 +0000 (11:38 +0000)
     and 'f275c97e2c93f0e846205b213e997b28ed0b148e'


Trivial merge