c946980 Merge branch 'master' into el6

Merged and Committed by tieugene 10 years ago
    Merge branch 'master' into el6
    
        
empty file added
file removed
-0
file modified
+4 -1