From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 1 Nov 2012 00:26:43 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=312c95f8e5494385cae9d91d45303d419b58ae04;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

312c95f8e5494385cae9d91d45303d419b58ae04