525870c fix merge

Authored and Committed by Rex Dieter 8 years ago
    fix merge
    
        
file modified
+3 -2
file modified
+0 -4