1b58eb5 merge el6 changes

Authored and Committed by xavierb 12 years ago
    merge el6 changes
    
        
file modified
+2 -2