4d96e32 Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Sync with upstream master
    
        
file removed
-140
file modified
+6 -8
file modified
+1 -1