From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 16 Jul 2011 02:10:44 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1885^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc35f6fea054f9e7488e3d06d4dfdaac86af310;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

7dc35f6fea054f9e7488e3d06d4dfdaac86af310