merge of 'adeeabec80174cc28a509847c43a6193d386e011'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 16:45:03 +0000 (16:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 16:45:03 +0000 (16:45 +0000)
     and 'cc5c410b6ecfd58ea2193cb45b120049db7eef5d'


Trivial merge