From: Brett Cannon <brett@python.org>
Date: Sun, 3 Feb 2013 16:38:16 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~1458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df80914a1e7acbcf5d4c311cb2d3ab4023e7128e;p=thirdparty%2FPython%2Fcpython.git

merge
---

df80914a1e7acbcf5d4c311cb2d3ab4023e7128e