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

merge heads
---

57c9c7b755671b7d212ead8988c34d9cf0b11fb3