From: Brett Cannon <brett@python.org>
Date: Fri, 4 May 2012 20:04:59 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a4~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d3ce9de4fd45e9bfa922011078b1e1986022df7;p=python

merge
---

2d3ce9de4fd45e9bfa922011078b1e1986022df7