cc437ec Merge branch 'master' into el5

Merged and Committed by dchen 10 years ago
    Merge branch 'master' into el5
    
        
file modified
+1 -45
file modified
+226 -25
file modified
+1 -1