Merged revisions 71952 via svnmerge from

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

................
  r71952 | kurt.kaiser | 2009-04-25 21:33:55 -0400 (Sat, 25 Apr 2009) | 10 lines

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

  ........
    r71812 | kurt.kaiser | 2009-04-22 22:36:01 -0400 (Wed, 22 Apr 2009) | 2 lines

    Produce correct version string to access the .chm
    docs on Windows.  Patch 5783 gpolo.  Will port.
  ........
................