Merged revisions 78172-78173 via svnmerge from

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

........
  r78172 | mark.dickinson | 2010-02-13 18:34:53 +0000 (Sat, 13 Feb 2010) | 4 lines

  Issue #7924: Fix an intermittent 'XXX undetected error' crash in
  test_capi, due to test_capsule failing to clear an exception.  Many
  thanks to Florent Xicluna for the diagnosis and fix.
........
  r78173 | mark.dickinson | 2010-02-13 18:37:34 +0000 (Sat, 13 Feb 2010) | 1 line

  Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.
........