From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Dec 2011 20:57:47 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~602
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=518e5173fcb43f9d4c3acb20f4a0e9a8123d4923;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

518e5173fcb43f9d4c3acb20f4a0e9a8123d4923