9267e70 Fix merge

Authored and Committed by mgrepl 13 years ago
    Fix merge
    
        
file modified
+9 -24