Patch reviewed by Raymond.

Now it correctly refers to the initial otherset.

Reviewed by Raymond. Will backport to 2.6.

Re-closes issue 3758. Thanks to Ralph Corderoy for the catch.

to claiming it is Mature.

I'll look at the bugs in the Optik bug tracker and copy them to the Python bug
tracker if they're still relevant.

#1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args()

svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line

  fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
  r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines

  Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.

  Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
  r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line

  add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........

Hyphenate left- and right-justified.
Fix 'registerd' typo

Issue #1706863: Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.

  UnboundLocalError: local variable 'serv' referenced before assignment