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)
commitea8318f04decd1f08054633d7110a1a1e4874726
tree9922d0234921ba996d02718caf06493555c4ec0d
parent35b7a1f17b7dddb69d3fee86040c811376cdfea3
parent3c38e235695be35e780db6da7b4817c894d84f90
Merge ... '1f09cd3a225e9cc6002c73f2660f6619f10f9e59'
     and '8c1fecdaef7355feda28b9b87ce84a94e1698804'