Merged revisions 81880 via svnmerge from

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

........
  r81880 | andrew.kuchling | 2010-06-10 19:14:34 -0500 (Thu, 10 Jun 2010) | 1 line

  Edit comments for current Python; bump version number of Python
........