From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 21 Dec 2011 17:22:02 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.3.0a1~544
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=059226b8ec3b94255b356e770c47e4311195af91;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

059226b8ec3b94255b356e770c47e4311195af91