b3cee50 Sync el6 branch with master

Authored and Committed by athmane 11 years ago
    Sync el6 branch with master
    
        
file modified
+3 -0
file modified
+47 -10
file modified
+1 -1