merge of '6d659ab83a5262d1e21010e8ef7628a905dfff84'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Jun 2008 11:43:36 +0000 (11:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Jun 2008 11:43:36 +0000 (11:43 +0000)
     and '9923a1dbe2ed8c727cb2a236afa5262aaa83fb19'


Trivial merge