[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.3 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/9f0bf9992664
changeset:   75831:9f0bf9992664
branch:      2.7
parent:      75745:3d4d52e47431
parent:      75830:e6061a297db7
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 18 21:22:45 2012 -0400
summary:
  merge 2.7.3 release branch

files:
  Tools/msi/uuids.py |  1 +
  1 files changed, 1 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
@@ -56,6 +56,7 @@
     '2.7.2121':'{B2E1F06E-F719-4786-972A-488A336EB2A0}', # 2.7.2rc1
     '2.7.2150':'{2E295B5B-1AD4-4d36-97C2-A316084722CF}', # 2.7.2
     '2.7.3121':'{1ACB88BF-1425-4f11-B664-6C89A3D7699C}', # 2.7.3rc1
+    '2.7.3122':'{B12311BE-6364-4b2a-A49A-551EEE10F3E4}', # 2.7.3rc2
     '2.7.3150':'{C0C31BCC-56FB-42a7-8766-D29E1BD74C7C}', # 2.7.3
     '2.7.4121':'{47F45F45-72D7-4e54-AF41-26767EDE95CF}', # 2.7.4rc1
     '2.7.4150':'{84ADC96C-B7E0-4938-9D6E-2B640D5DA224}', # 2.7.4

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