Merge fix for Intel on Win32.

svn path=; revision=84382