From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 20 May 2011 16:43:41 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5a16bf532486d3279230623e9160435d011de3b;p=python

merge heads
---

a5a16bf532486d3279230623e9160435d011de3b