Merged revisions 74960 via svnmerge from

Merged revisions 74960 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74960 | ezio.melotti | 2009-09-20 10:19:57 +0300 (Sun, 20 Sep 2009) | 9 lines

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

  ........
    r74958 | ezio.melotti | 2009-09-20 10:10:39 +0300 (Sun, 20 Sep 2009) | 1 line

    #6881 - fixed wrong return type; improved the formatting
  ........
................