5a82039 fix more git merge problems

Authored and Committed by rmeggins 13 years ago
    fix more git merge problems
    
        
file modified
+7 -1