Merged revisions 86051 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86051 | benjamin.peterson | 2010-10-31 13:13:04 -0500 (Sun, 31 Oct 2010) | 1 line

  more fun with string exceptions
........