From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 23 Nov 2011 01:06:23 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.3.0a1~742
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0bcca510ad2af33d1d62a922d8c3d36400f8bcf;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

e0bcca510ad2af33d1d62a922d8c3d36400f8bcf