From: Brett Cannon <brett@python.org>
Date: Fri, 11 Jan 2013 20:44:57 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~1640
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77173c01c94bb7df50a732ac7413bbafcad842e3;p=python

merge
---

77173c01c94bb7df50a732ac7413bbafcad842e3