6ac2021 fix conflict

Authored and Committed by pvrabec 15 years ago
    fix conflict
    
        
file modified
+1 -1
file modified
+11 -7
file modified
+1 -1