2555487 Merge branch 'master' into f21 and rebase to 10.3-rc1

Merged and Committed by ignatenkobrain 9 years ago
    Merge branch 'master' into f21 and rebase to 10.3-rc1
    
    Conflicts:
    	.gitignore
    	mesa.spec
    	sources
    
        
file modified
+1 -0
file modified
+9 -3
file removed
-23
file removed
-978
file modified
+17 -11
file modified
+1 -1