Merged revisions 73607 via svnmerge from

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

................
  r73607 | martin.v.loewis | 2009-06-28 14:28:29 +0200 (So, 28 Jun 2009) | 9 lines

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

  ........
    r73606 | martin.v.loewis | 2009-06-28 14:24:23 +0200 (So, 28 Jun 2009) | 2 lines

    Fix types in logic to compute help file name.
  ........
................