bd7cb64 Backport some changes from Rawhide

Authored and Committed by dwalsh 13 years ago
    Backport some changes from Rawhide
    
        
file modified
+661 -1776