2c3c59d Merge branch 'master' into el6

Merged and Committed by orion 10 years ago
    Merge branch 'master' into el6
    
        
file modified
+2 -1
file modified
+4 -13