From: Brett Cannon <brett@python.org>
Date: Sun, 28 Oct 2012 15:49:00 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.1rc1~729
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c1da829bac310f555d3f3e8e643e9966d7d77fc;p=python

merge
---

6c1da829bac310f555d3f3e8e643e9966d7d77fc