From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 19:00:35 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a4~311^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c82d9dee0fa41c07d7e400d8fe432f4be506c38c;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

c82d9dee0fa41c07d7e400d8fe432f4be506c38c