merge of '77e6de1879d8cb9e2cedcd283c5c43e8c333cc65'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 May 2008 10:29:54 +0000 (10:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 1 May 2008 10:29:54 +0000 (10:29 +0000)
     and 'a73b62bfa46dd3bec609e1b1307c59a93f4a4469'


Trivial merge