Merged revisions 82234 via svnmerge from

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

................
  r82234 | r.david.murray | 2010-06-25 20:17:12 -0400 (Fri, 25 Jun 2010) | 9 lines

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

  ........
    r82233 | r.david.murray | 2010-06-25 20:06:44 -0400 (Fri, 25 Jun 2010) | 2 lines

    #4640: add a test to optparse that proves issue is invalid.
  ........
................