75bedb0 Auto-sync with upstream master for mass rebuild

Authored and Committed by Siddhesh Poyarekar 9 years ago
    Auto-sync with upstream master  for mass rebuild
    
    - Auto-sync with upstream master.
    - Revert to only defining __extern_always_inline for g++-4.3+.
    - Fix build failure in compat-gcc-32 (#186410).
    
        
file modified
+10 -2
file modified
+1 -1