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

merge heads
---

0442f56c4ac0982ae61ea73f8b3341d2a08f511a