a2f2e6d Post-merge (f15->f14) cleanup

Authored and Committed by Petr Sabata 12 years ago
    Post-merge (f15->f14) cleanup
    
        
file modified
+1 -4