6e99506 fix conflicts (#340671)

Authored and Committed by notting 16 years ago
    fix conflicts (#340671)
    
        
file modified
+5 -1