6abb4ca fix merge weirdness

Authored and Committed by rmeggins 13 years ago
    fix merge weirdness
    
        
file modified
+0 -6