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

[benjamin.peterson]

http://hg.python.org/cpython/rev/6a4b67e85309
changeset:   70650:6a4b67e85309
branch:      2.7
parent:      70637:78d79499e7de
parent:      70649:9562cbf41b81
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jun 05 12:51:18 2011 -0500
summary:
  merge 2.7.2 release branch

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


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1022,8 +1022,6 @@
             lib.add_file("zipdir.zip")
         if dir=='tests' and parent.physical=='distutils':
             lib.add_file("Setup.sample")
-        if dir=='cjkencodings':
-            lib.glob("*.txt")
         if dir=='decimaltestdata':
             lib.glob("*.decTest")
         if dir=='xmltestdata':
diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -53,4 +53,6 @@
     '2.7.1121':'{60a4036a-374c-4fd2-84b9-bfae7db03931}', # 2.7.1rc1
     '2.7.1122':'{5965e7d1-5584-4de9-b13a-694e0b2ee3a6}', # 2.7.1rc2
     '2.7.1150':'{32939827-d8e5-470a-b126-870db3c69fdf}', # 2.7.1
+    '2.7.2121':'{B2E1F06E-F719-4786-972A-488A336EB2A0}', # 2.7.2rc1
+    '2.7.2150':'{2E295B5B-1AD4-4d36-97C2-A316084722CF}', # 2.7.2
 }

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