8d421dc fix merge anomaly

Authored and Committed by pwouters 10 years ago
    fix merge anomaly
    
        
file modified
+0 -34