From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 20:19:08 +0000 (-0500)
Subject: merge 2.7 release
X-Git-Tag: v2.7.4rc1~1022^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8f4118f9b554a0c2110fb9d3f33fa5fa0a6c488;p=thirdparty%2FPython%2Fcpython.git

merge 2.7 release
---

d8f4118f9b554a0c2110fb9d3f33fa5fa0a6c488