93b7966 fix files conflicts with 4.2.x

Authored and Committed by than 15 years ago
1 file changed. 11 lines added. 1 lines removed.
    fix files conflicts with 4.2.x
    
        
file modified
+11 -1