merge of '11190e741ffccdf2d209ad44d788d7a645b62eef'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 12:07:32 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 12:07:32 +0000 (12:07 +0000)
     and 'fe8733bd5827d972336bdf138c9082df08f4d847'


Trivial merge