Merged revisions 82008 via svnmerge from

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

................
  r82008 | r.david.murray | 2010-06-15 19:46:40 -0400 (Tue, 15 Jun 2010) | 9 lines

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

  ........
    r81634 | r.david.murray | 2010-05-31 21:42:41 -0400 (Mon, 31 May 2010) | 2 lines

    #7583: clarify discussion of hard tab expansion in doctests.
  ........
................