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

merge heads
---

4092e68396e861ca57f1a5761e8a60d5ce300877