e8aad3f Merge branch 'master' into el6

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