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

................
  r77998 | michael.foord | 2010-02-05 12:54:27 -0800 (Fri, 05 Feb 2010) | 9 lines

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

  ........
    r77997 | michael.foord | 2010-02-05 20:52:14 +0000 (Fri, 05 Feb 2010) | 1 line

    Closes issue 7030.
  ........
................