Merged revisions 72367 via svnmerge from

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

........
  r72367 | benjamin.peterson | 2009-05-05 18:00:48 -0500 (Tue, 05 May 2009) | 1 line

  tabify :(
........