Merged revisions 73391 via svnmerge from

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

................
  r73391 | martin.v.loewis | 2009-06-12 19:31:41 +0200 (Fr, 12 Jun 2009) | 10 lines

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

  ........
    r73390 | martin.v.loewis | 2009-06-12 19:28:31 +0200 (Fr, 12 Jun 2009) | 3 lines

    Support AMD64 in msilib. Set Win64 on reglocator.
    Fixes #6258.
  ........
................