merge of '38838ab61d84fb4ed9c36e21484735a9eca09c9c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Apr 2008 22:26:57 +0000 (22:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Apr 2008 22:26:57 +0000 (22:26 +0000)
     and '9febc982a33100b03781aa11d0b9064c71b21683'


Trivial merge