From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Oct 2011 17:19:30 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1394
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8726c4d96e5b56013e5c1e6c6fd25a578eb4ae4;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

a8726c4d96e5b56013e5c1e6c6fd25a578eb4ae4