Merged revisions 79762 via svnmerge from

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

........
  r79762 | benjamin.peterson | 2010-04-04 18:01:03 -0500 (Sun, 04 Apr 2010) | 1 line

  tabify
........