b9d3cdc Merge branch 'master' into f21

Merged and Committed by Siddhesh Poyarekar 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	glibc.spec
    
        
file modified
+11 -2
file modified
+1 -1