f853761 Fixed merge conflict

Merged and Committed by Radek Novacek 13 years ago
    Fixed merge conflict
    
        
file modified
+8 -3