Merged revisions 74813 via svnmerge from

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

........
  r74813 | ezio.melotti | 2009-09-16 03:49:03 +0300 (Wed, 16 Sep 2009) | 1 line

  updated the doc to match the module docstring, fixed a couple of errors in the doc markup and in the module
........