2685b44 Sync with rawhide.

Authored and Committed by terjeros 14 years ago
    Sync with rawhide.
    
        
file modified
+1 -1
file modified
+13 -4
file modified
+1 -1