merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:49:28 +0000 (00:49 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:49:28 +0000 (00:49 +0000)
     and '2d2fba06a82095954bfbae27ea7e7024c3604521'


Trivial merge