merge of '013b42d9a596e92a85b2c13b49e8ce89c99c1b14'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 29 Jan 2008 23:41:05 +0000 (23:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 29 Jan 2008 23:41:05 +0000 (23:41 +0000)
     and 'a1e797708c3d5dd33d64905da2c778fc015eac9a'


Trivial merge