Merged revisions 77700 via svnmerge from

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

................
  r77700 | ezio.melotti | 2010-01-22 19:36:17 +0200 (Fri, 22 Jan 2010) | 9 lines

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

  ........
    r77697 | ezio.melotti | 2010-01-22 18:58:28 +0200 (Fri, 22 Jan 2010) | 1 line

    This should fix the failure introduced in r77680. The error message is now different and it caused the test to fail. The failing test is not present in 2.5 so it is failing only on 2.6 and newer versions.
  ........
................