07633bd fixes from EL6 branch

Authored and Committed by xavierb 12 years ago
    fixes from EL6 branch
    
        
file modified
+1 -1
file modified
+3 -1
file modified
+4 -1