From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Feb 2012 16:49:07 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6fbf47b28173c7bbac9a9e19201876d945859d3;p=python

merge heads
---

c6fbf47b28173c7bbac9a9e19201876d945859d3