merge of '1f09cd3a225e9cc6002c73f2660f6619f10f9e59'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 19:07:38 +0000 (19:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 19:07:38 +0000 (19:07 +0000)
     and '8c1fecdaef7355feda28b9b87ce84a94e1698804'


Trivial merge