From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 31 May 2011 00:25:43 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2183^2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cccfd9932dcbf808ca3b3e2c494799dfab4ae074;p=python

merge heads
---

cccfd9932dcbf808ca3b3e2c494799dfab4ae074