From: Brett Cannon <brett@python.org>
Date: Sun, 28 Oct 2012 15:48:24 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~2150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e8c49d3583bbe86dd26f07819fd526eda8a0dcc;p=python

merge
---

0e8c49d3583bbe86dd26f07819fd526eda8a0dcc