5c361d9 Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 9 years ago
    Sync with upstream master
    
        
file modified
+3 -6
file modified
+1 -1