Merged revisions 80191 via svnmerge from

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

................
  r80191 | ronald.oussoren | 2010-04-18 21:07:43 +0200 (Sun, 18 Apr 2010) | 13 lines

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

  ........
    r80187 | ronald.oussoren | 2010-04-18 19:59:37 +0200 (Sun, 18 Apr 2010) | 6 lines

    Add the OSX universal binary related options
    to CFLAGS instead of BASECFLAGS.

    This fixes issue 8366 and is needed due to
    changes introduced in the fix for issue 1628484.
  ........
................