3ebc8bb sync with current rawhide

Merged and Committed by wolfy 10 years ago
    sync with current rawhide
    
        
file modified
+21 -3
file modified
+1 -1