From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Oct 2011 04:06:15 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1071
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c801ad36ee9730e7a066ffb2ee2636684527d24b;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

c801ad36ee9730e7a066ffb2ee2636684527d24b