merge of '1d903fb7ec58f7624d299d4ab97b686792281fab'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 17:59:41 +0000 (17:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 17:59:41 +0000 (17:59 +0000)
commit7c0dcff4a17535f38fe103ddd02584362a7ca6cd
tree6577323069da0b672069e73e10dfc28e2d2c7703
parentadcb597cd9bbb8e8326f64b67d46efd1b5bedb3d
parentd2e55dcd06368cca2754e0ce8aa9e70c486f452a
Merge ... '1d903fb7ec58f7624d299d4ab97b686792281fab'
     and 'e32ef2d91c28ac53b3bb5ea6cc70a9ed3182abb5'