c899b49 Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Sync with upstream master
    
    Fix up glibc-rh741105.patch so that it continues to apply correctly.
    
        
file modified
+2 -3
file modified
+5 -2
file modified
+1 -1