Merged revisions 80187 via svnmerge from

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.
........

Also: force usage of gcc-4.0 when building using the 10.4 SDK,
this is needed to avoid compile errors when building on OSX 10.6
(and is already in the trunk)