From: Brett Cannon <brett@python.org>
Date: Sat, 4 May 2013 21:29:36 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~803
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f9b4343ed07bd6908cf7d679fa1d50484831294;p=python

merge
---

4f9b4343ed07bd6908cf7d679fa1d50484831294