merge 2.7.4 release branch

.hgtags

@@ -157,3 +157,4 @@ b2c6aff96e1251a4f03cf866e7e75fb8232869f2 v2.7.3rc1
 d46c1973d3c407ecaa6a8ee16d3fad3ef506b51f v2.7.3rc2
 70274d53c1ddc60c5f9a2b8a422a49884021447c v2.7.3
 a8d18780bc2bccf16bf580587e1e3c934a98f6a7 v2.7.4rc1
+026ee0057e2d3305f90a9da41daf7c3f9eb1e814 v2.7.4

Include/patchlevel.h

@@ -23,11 +23,11 @@
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	7
 #define PY_MICRO_VERSION	4
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"2.7.4rc1+"
+#define PY_VERSION      	"2.7.4"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty

Lib/distutils/__init__.py

@@ -15,5 +15,5 @@ __revision__ = "$Id$"
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.4rc1"
+__version__ = "2.7.4"
 #--end constants--

Lib/idlelib/idlever.py

-IDLE_VERSION = "2.7.4rc1"
+IDLE_VERSION = "2.7.4"

Misc/NEWS

@@ -38,7 +38,7 @@ Documentation
 What's New in Python 2.7.4?
 ===========================
 
-*Release date: XXXX-XX-XX*
+*Release date: 2013-04-06*
 
 Build
 -----

Misc/RPM/python-2.7.spec

@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.7.4rc1
+%define version 2.7.4
 %define libvers 2.7
 #--end constants--
 %define release 1pydotorg