From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 21 Mar 2012 18:26:09 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a2~97^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65e32d1f1a78aef527afe65011a44e2e873f38c8;p=python

merge heads
---

65e32d1f1a78aef527afe65011a44e2e873f38c8