Merged revisions 82233,82242 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.
........
  r82242 | r.david.murray | 2010-06-25 23:27:32 -0400 (Fri, 25 Jun 2010) | 2 lines

  Fix indentation in recently added test.
........
1 file changed