merge of '298797d86056bd55b8e0191685cb8ae42de55f7d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 16:42:44 +0000 (16:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 16:42:44 +0000 (16:42 +0000)
     and 'e3a17e2ff263cac6d4b035034dc79a0e05fc548d'


Trivial merge