4a42547 Merge remote-tracking branch 'origin/f19'

Merged and Committed by kalev 10 years ago
    Merge remote-tracking branch 'origin/f19'
    
    Sync with the F19 branch that was ahead of F20/rawhide.
    
        
file modified
+51 -38
file modified
+1 -1