From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 3 Jun 2011 22:50:59 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2183^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dfcb1a00dbcbc76fcd152d652d3f83b53b14e45;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

4dfcb1a00dbcbc76fcd152d652d3f83b53b14e45