Merged revisions 80129 via svnmerge from

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

........
  r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line

  tiny simplification
........