From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 23:02:24 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d87963ecf6f0f07f346306c3b34a16f8f97de61c;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

d87963ecf6f0f07f346306c3b34a16f8f97de61c