From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Dec 2011 21:42:28 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3563b18c19c37902ecbc6ab28c92b3674a3eed32;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

3563b18c19c37902ecbc6ab28c92b3674a3eed32