3ede8ec sync with Rawhide

Authored and Committed by mschwendt 14 years ago
    sync with Rawhide
    
        
file modified
+6 -2