From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Jun 2011 00:24:31 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2076
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eabfb5b1b9eb621e414bbe60b8665b4c96acf0cc;p=python

merge heads
---

eabfb5b1b9eb621e414bbe60b8665b4c96acf0cc