From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 22 Mar 2012 12:57:56 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~954
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72c6227df88f485ddb851ea95c39918e468bf0d5;p=python

merge heads
---

72c6227df88f485ddb851ea95c39918e468bf0d5