From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Mar 2012 21:46:35 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a2~219^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=817dd91595d202e9582435430b98ba65d14d14a7;p=python

merge heads
---

817dd91595d202e9582435430b98ba65d14d14a7