db772eb Merge branch 'master' into el6

Merged and Committed by fab 10 years ago
    Merge branch 'master' into el6
    
        
file modified
+3 -0
file modified
+13 -1
file modified
+1 -1