From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2011 11:57:38 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1570
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=388c0e2325f606d497ec174a4a6b28c4d352db2c;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

388c0e2325f606d497ec174a4a6b28c4d352db2c