From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 28 Sep 2011 14:48:40 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1477
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e56717c3d201db2dadacd20f654d6be7f9ed18ed;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

e56717c3d201db2dadacd20f654d6be7f9ed18ed