c90adf8 Sync with upstream master.

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Sync with upstream master.
    
        
file modified
+5 -2
file modified
+1 -1