7713b3d Merge el6 changes into the f19 branch.

Merged and Committed by ralph 10 years ago
    Merge el6 changes into the f19 branch.
    
        
file modified
+17 -4