Merged revisions 79260 via svnmerge from

Merged revisions 79260 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79260 | benjamin.peterson | 2010-03-21 18:17:57 -0500 (Sun, 21 Mar 2010) | 13 lines

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

  ........
    r79138 | benjamin.peterson | 2010-03-20 11:16:44 -0500 (Sat, 20 Mar 2010) | 1 line

    document exitfunc fixer
  ........
    r79139 | benjamin.peterson | 2010-03-20 11:17:37 -0500 (Sat, 20 Mar 2010) | 1 line

    wrap
  ........
................