9eb38c1 Sync with upstream master

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