tree 7dde8acf5dc9cb0f91f229b7fbfe0958657786fc
parent 4f6da63f450459c71f2a22dc7b0351c48f391225
author Georg Brandl <georg@python.org> 1242989071 +0000
committer Georg Brandl <georg@python.org> 1242989071 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4072831

Recorded merge of revisions 72830 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72830 | georg.brandl | 2009-05-22 12:40:00 +0200 (Fr, 22 Mai 2009) | 1 line

  #6086: fix spelling and use a better exception to catch.
........