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

merge heads
---

e451ec393faa67e5d7ed692d36d3245dd18c4457