From: Brett Cannon <brett@python.org>
Date: Fri, 25 Oct 2013 19:45:42 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0b1~538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=502834cf3c6add73507b709b2f65d5118ec3a735;p=thirdparty%2FPython%2Fcpython.git

merge
---

502834cf3c6add73507b709b2f65d5118ec3a735