[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

[martin.v.loewis]

http://hg.python.org/cpython/rev/31b3218794e2
changeset:   72269:31b3218794e2
parent:      72267:df673c6d3e0b
parent:      72268:b38fdedb29d9
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Mon Sep 05 00:17:49 2011 +0200
summary:
  Merge with 3.2

files:
  Tools/msi/uuids.py |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -30,4 +30,9 @@
     '3.2.1121':'{4f90de4a-83dd-4443-b625-ca130ff361dd}', # 3.2.1rc1
     '3.2.1122':'{dc5eb04d-ff8a-4bed-8f96-23942fd59e5f}', # 3.2.1rc2
     '3.2.1150':'{34b2530c-6349-4292-9dc3-60bda4aed93c}', # 3.2.1
+    '3.2.2121':'{DFB29A53-ACC4-44e6-85A6-D0DA26FE8E4E}', # 3.2.2rc1
+    '3.2.2150':'{4CDE3168-D060-4b7c-BC74-4D8F9BB01AFD}', # 3.2.2
+    '3.2.3121':'{B8E8CFF7-E4C6-4a7c-9F06-BB3A8B75DDA8}', # 3.2.3rc1
+    '3.2.3150':'{789C9644-9F82-44d3-B4CA-AC31F46F5882}', # 3.2.3
+
 }

-- 
Repository URL: http://hg.python.org/cpython