From: Brett Cannon <brett@python.org>
Date: Sun, 14 Apr 2013 16:50:51 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~924
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c367c2afeb56af0476c549c3f00e6dbcc7f46ea;p=python

merge
---

9c367c2afeb56af0476c549c3f00e6dbcc7f46ea