bf5e654 Resync with upstream master

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Resync with upstream master
    
        
file removed
-458
file modified
+5 -10
file modified
+1 -1