merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
authorMichael Lauer <mickey@vanille-media.de>
Sat, 19 Aug 2006 16:02:31 +0000 (16:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 19 Aug 2006 16:02:31 +0000 (16:02 +0000)
     and 67adbb4efb9e9642f8b5476abd6692720c8cd642


Trivial merge