254290 - Update to upstream

Authored and Committed by dwalsh 8 years ago
    - Update to upstream
    	* Thread local storage fixes from Eamon Walsh.
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1