2f2bbd8 fix more conflicts

Authored and Committed by notting 17 years ago
    fix more conflicts
    
        
file modified
+4 -2