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

........
  r82126 | thomas.heller | 2010-06-21 16:00:24 +0200 (Mo, 21 Jun 2010) | 1 line

  Fix #8959 by reverting revision 80761.
........
  r82127 | thomas.heller | 2010-06-21 17:01:18 +0200 (Mo, 21 Jun 2010) | 2 lines

  Add tests for problems reported in issue 8959.
........
16 files changed