merge of '0ad3682d1538e6c932e6fb254eaeac8447d18359'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Dec 2007 16:19:59 +0000 (16:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 23 Dec 2007 16:19:59 +0000 (16:19 +0000)
     and 'd750bdb7f64441d5df5e00b2b42098fbf3550215'


Trivial merge