merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 9 Sep 2007 11:41:44 +0000 (11:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 9 Sep 2007 11:41:44 +0000 (11:41 +0000)
     and '60271e29029910207b8512833d049fad50fb282b'


Trivial merge