7dc7082 Pick usefull stuff from Troy's el6 commit

Authored and Committed by lkundrak 9 years ago
    Pick usefull stuff from Troy's el6 commit
    
        
file modified
+0 -5
file modified
+4 -1