9d331e9 Sync with upstream master

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