merge of '99919cb8b538ef795301795c0abf7a23fa66d751'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 20:05:58 +0000 (20:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 20:05:58 +0000 (20:05 +0000)
commita19a5fbbe6a205685d3b832ca897e4ac8a9908bd
tree4d356f483c44d9716db9c80a365be4cf1babc34c
parent64b5be90302487a5ada3dfb300baddb2b1ff7524
parent78d758eca2ba374026229ebe2254026dd08749b4
Merge ... '99919cb8b538ef795301795c0abf7a23fa66d751'
     and 'e50520839964c08c9cfd593b957f1efb58c951aa'