From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Mar 2012 14:40:55 +0000 (-0400)
Subject: merge from release branch
X-Git-Tag: v2.7.4rc1~957
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e3c1075495dfc1ed481f65091d1f9241868324a;p=python

merge from release branch
---

0e3c1075495dfc1ed481f65091d1f9241868324a