From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 23:05:58 +0000 (-0400)
Subject: merge 2.7.3 release branch
X-Git-Tag: v2.7.4rc1~914
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad6b3f570af63acbf83348641f2ded62e21c40ea;p=python

merge 2.7.3 release branch
---

ad6b3f570af63acbf83348641f2ded62e21c40ea