2a80c7 Fix merge context issues

Authored and Committed by Miroslav Grepl 12 years ago
    Fix merge context issues
    
        
file modified
+17 -24
file modified
+0 -9