1cc5988 add integration patch

Authored and Committed by Peng Wu 12 years ago
    add integration patch
    
        
file modified
+6 -1