From: Brett Cannon <brett@python.org>
Date: Thu, 15 Nov 2012 21:13:00 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~2003
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0676caf66082af23806f2316e4debf2c70bf9cf5;p=thirdparty%2FPython%2Fcpython.git

merge
---

0676caf66082af23806f2316e4debf2c70bf9cf5