d4219e3 - add conflicts (#400661)

Authored and Committed by pvrabec 16 years ago
    - add conflicts (#400661)
    
        
file modified
+5 -1