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

merge
---

4d35c57c9c4e68b9dca7f49acb90030e216595bf