ff3a6af fix incomplete merge

Authored and Committed by Rex Dieter 9 years ago
    fix incomplete merge
    
        
file modified
+0 -5