From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 30 May 2011 16:15:05 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2183^2~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6c5e0461174d60b9d8ef35336e9576dbdc6121c;p=python

merge heads
---

c6c5e0461174d60b9d8ef35336e9576dbdc6121c