Merged revisions 78156 via svnmerge from

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

................
  r78156 | ronald.oussoren | 2010-02-11 14:38:58 +0100 (Thu, 11 Feb 2010) | 9 lines

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

  ........
    r78154 | ronald.oussoren | 2010-02-11 14:26:54 +0100 (Thu, 11 Feb 2010) | 2 lines

    Finish fix for issue 7715, after explicit search for calls to `arch`
  ........
................