Merged revisions 81087,81106 via svnmerge from

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

........
  r81087 | fred.drake | 2010-05-11 14:12:27 -0400 (Tue, 11 May 2010) | 2 lines

  fix typo
........
  r81106 | fred.drake | 2010-05-11 21:22:03 -0400 (Tue, 11 May 2010) | 2 lines

  fix error introduced in previous commit, and the adjacent additional typo
........