From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 2 Aug 2011 18:06:19 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1774
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c46480063c7cb758525654066158f33a60b2b12;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

9c46480063c7cb758525654066158f33a60b2b12