From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Jun 2011 03:05:22 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b58359cca86c05b3fad185aeb7f754f9a7d318ab;p=python

merge heads
---

b58359cca86c05b3fad185aeb7f754f9a7d318ab