From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 18:54:09 +0000 (-0400)
Subject: merge 2.7 release branch
X-Git-Tag: v2.7.4rc1~915
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe146ea3c72b573974dfc2e8e6a60534f9e612a7;p=python

merge 2.7 release branch
---

fe146ea3c72b573974dfc2e8e6a60534f9e612a7