merge of 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Jun 2007 17:31:37 +0000 (17:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Jun 2007 17:31:37 +0000 (17:31 +0000)
     and 'dfe282821bb00a1e4097acfcf4e97e3d5169bdc4'


Trivial merge