Merged revisions 81906 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81906 | benjamin.peterson | 2010-06-11 16:40:37 -0500 (Fri, 11 Jun 2010) | 1 line

  different spellings are just unacceptable
........