merge of '148f8dde1ce484726500604f6b511b828737ed47'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 13:05:18 +0000 (13:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 13:05:18 +0000 (13:05 +0000)
     and '6ac0eb72e728e774076082cbfbb28ee430dc6485'


Trivial merge