merge of '000f3043f3bc342f7e9f0ae01f68a648ca77b403'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:59:59 +0000 (14:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:59:59 +0000 (14:59 +0000)
     and 'da9d34bcc42bfafdd2c02e04160e8a8334a3267f'


Trivial merge