Merged revisions 79765 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79765 | benjamin.peterson | 2010-04-04 18:09:06 -0500 (Sun, 04 Apr 2010) | 9 lines

  Merged revisions 79763 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

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

    fix tabs
  ........
................