From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Jun 2011 00:55:19 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2086
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52810a57f3eeefbd1bd74b8810cb41c1e0b19bb5;p=python

merge heads
---

52810a57f3eeefbd1bd74b8810cb41c1e0b19bb5