59f7846 Resync with upstream master

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Resync with upstream master
    
        
file modified
+2 -2
file modified
+2 -2