04f29fa resolve conflict

Merged and Committed by ovasik 12 years ago
    resolve conflict
    
        
file modified
+5 -2