Merged revisions 85436 via svnmerge from

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

........
  r85436 | benjamin.peterson | 2010-10-13 17:20:15 -0500 (Wed, 13 Oct 2010) | 1 line

  put PYTHONIOENCODING in man page
........