merge of '3720558b0d1400bac165546368a13f5ef5824873'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 06:34:03 +0000 (06:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 06:34:03 +0000 (06:34 +0000)
     and 'fd803d898183d6c18157193aaa79a715b846876d'


Trivial merge