From: Brett Cannon <brett@python.org>
Date: Sun, 27 Jan 2013 18:08:40 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~1512
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4291fa600060ad12aa4e0aad7a26255875836f9;p=python

merge
---

e4291fa600060ad12aa4e0aad7a26255875836f9