From: Brett Cannon <brett@python.org>
Date: Sat, 6 Jul 2013 22:05:02 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1f7632c1c54ef7648dfa14753b5bdeb9f02781d;p=python

merge
---

b1f7632c1c54ef7648dfa14753b5bdeb9f02781d