From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 10 Oct 2013 21:40:48 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a4~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dfa3d5d631fc62d3f08c0813db9a14c5b84f843;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

4dfa3d5d631fc62d3f08c0813db9a14c5b84f843