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

merge heads
---

f63d55800770547d4dfff86797de8572fe609f4e