52f69e7 Sync with upstream master and Resolve: #1069559

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Sync with upstream master and Resolve: #1069559
    
        
file modified
+12 -2
file modified
+1 -1