merge of '3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:36 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:36 +0000 (00:40 +0000)
     and '452752a8a35efe6e789ae2bdef83478bdb218f00'


Trivial merge