Merged revisions 82244 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82244 | r.david.murray | 2010-06-25 23:34:33 -0400 (Fri, 25 Jun 2010) | 9 lines

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

  ........
    r82242 | r.david.murray | 2010-06-25 23:27:32 -0400 (Fri, 25 Jun 2010) | 2 lines

    Fix indentation in recently added test.
  ........
................

Lib/test/test_optparse.py

@@ -759,7 +759,7 @@ class TestStandard(BaseTest):
     def test_combined_single_invalid_option(self):
         self.parser.add_option("-t", action="store_true")
         self.assertParseFail(["-test"],
-                          "no such option: -e")
+                             "no such option: -e")
 
 class TestBool(BaseTest):
     def setUp(self):