a0cce19 Merge branch 'master' into el6

Merged and Committed by fab 11 years ago
    Merge branch 'master' into el6
    
        
file modified
+5 -0
file modified
+29 -18
file modified
+1 -1