From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 18:01:04 +0000 (-0500)
Subject: merge from 2.7 release branch
X-Git-Tag: v2.7.4rc1~964
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1acd0ab381b4e50b8f1a3cd0186ff1551c81b06;p=thirdparty%2FPython%2Fcpython.git

merge from 2.7 release branch
---

f1acd0ab381b4e50b8f1a3cd0186ff1551c81b06