2595761 fix merge

Merged and Committed by leigh123linux 10 years ago
    fix merge
    
        
file modified
+9 -2