Merged revisions 79070 via svnmerge from

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

........
  r79070 | benjamin.peterson | 2010-03-18 17:44:54 -0500 (Thu, 18 Mar 2010) | 1 line

  these lines can now be dispensed with
........