9494605 Merge branch 'master' into f20

Merged and Committed by jamielinux 10 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	sources
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+59 -18