From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Jun 2011 02:40:34 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.1rc2~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66b371e0001f5a8de4765c23e2e88e610fb4808d;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

66b371e0001f5a8de4765c23e2e88e610fb4808d