7b62918 Merge branch 'master' into el6

Merged and Committed by fab 10 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+6 -1
file modified
+10 -6
file modified
+1 -1