Merged revisions 72400 via svnmerge from

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

................
  r72400 | jeroen.ruigrok | 2009-05-06 15:18:35 +0200 (wo, 06 mei 2009) | 11 lines

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

  ........
    r72399 | jeroen.ruigrok | 2009-05-06 15:16:36 +0200 (wo, 06 mei 2009) | 4 lines

    Be more explicit about the error we are catching.

    Requested by: Antoine Pitrou
  ........
................