From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Mar 2012 01:23:22 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~958
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e79499504e82e92d9aa163d18cd25a81959b0db6;p=python

merge heads
---

e79499504e82e92d9aa163d18cd25a81959b0db6