merge of '0fb63a3a1c21083e64e1fc35d8abe83eabdecfe6'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 20:05:22 +0000 (20:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 20:05:22 +0000 (20:05 +0000)
     and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'


Trivial merge