From: Brett Cannon <brett@python.org>
Date: Fri, 27 Apr 2012 18:02:33 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e66ac683cce9f6e4abda7d01836dab70eeefb49;p=python

merge
---

9e66ac683cce9f6e4abda7d01836dab70eeefb49