1665cbe Fix more merge issues

Authored and Committed by mgrepl 10 years ago
    Fix more merge issues
    
        
file modified
+6 -7
file modified
+2 -3