fb2d253 fix bad merge

Authored and Committed by robmv 15 years ago
    fix bad merge
    
        
file modified
+0 -3