Merged revisions 76713 via svnmerge from

Merged revisions 76713 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76713 | ronald.oussoren | 2009-12-08 17:35:28 +0100 (Tue, 08 Dec 2009) | 11 lines

  Merged revisions 76712 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76712 | ronald.oussoren | 2009-12-08 17:32:52 +0100 (Tue, 08 Dec 2009) | 4 lines

    Fix for issue 7452: HAVE_GCC_ASM_FOR_X87 gets set when doing a universal build on
    an i386 based machine, but should only be active when compiling the x86 part of
    the universal binary.
  ........
................