3739095 Merge in changes from el6 (that should also work in f20 and f21).

Merged and Committed by Brad Bell 9 years ago
1 file changed. 29 lines added. 6 lines removed.
    Merge in changes from el6 (that should also work in f20 and f21).
    
        
file modified
+29 -6