3158c8d fix merge issue

Authored and Committed by mikem 8 years ago
    fix merge issue
    
        
file modified
+2 -1