e767779 Merge branch 'master' into el6

Merged and Committed by nb 11 years ago
    Merge branch 'master' into el6
    
        
file modified
+2 -0
file modified
+1 -1