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)
commit08ff1daf1f92bffd5d36e79229c8974efc057802
treed2e0f5fc1bb88a2637d820cd5376aa294cd5c264
parent2c7f8fcc887ecc9ccb2bead8353f30521904de6f
parenta725469aa29c5adfef01f8133a9dc3a57c2c669c
Merge ... '0ad3682d1538e6c932e6fb254eaeac8447d18359'
     and 'd750bdb7f64441d5df5e00b2b42098fbf3550215'