d340e27 Post-merge cleanup

Authored and Committed by Petr Ĺ abata 12 years ago
    Post-merge cleanup
    
        
file modified
+2 -5