merge of '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jan 2008 09:17:50 +0000 (09:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jan 2008 09:17:50 +0000 (09:17 +0000)
     and '77255eff938f77a73e2bcaf9e08a9568e2c88208'


Trivial merge