Merged revisions 66304-66305,66307 via svnmerge from

Merged revisions 66304-66305,66307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66304 | martin.v.loewis | 2008-09-08 14:02:45 +0200 (Mo, 08 Sep 2008) | 2 lines

  Allow passing the MSI file name to merge.py.
........
  r66305 | martin.v.loewis | 2008-09-08 15:50:10 +0200 (Mo, 08 Sep 2008) | 3 lines

  Issue #2271: Set SecureCustomProperties so that installation will properly
  use the TARGETDIR even for unprivileged users.
........
  r66307 | martin.v.loewis | 2008-09-08 18:15:38 +0200 (Mo, 08 Sep 2008) | 1 line

  Add UUIDs for upcoming releases
........