Merged revisions 74974 via svnmerge from

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

................
  r74974 | ronald.oussoren | 2009-09-20 20:57:50 +0200 (Sun, 20 Sep 2009) | 12 lines

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

  ........
    r74972 | ronald.oussoren | 2009-09-20 20:54:16 +0200 (Sun, 20 Sep 2009) | 5 lines

    Merge a newer version of libffi_osx, based on the
    version of libffi in OSX 10.6.1.

    This fixes issue6918
  ........
................