From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Apr 2012 15:28:49 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dba1b40b6064107d63f228fe67a258dd1123b189;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

dba1b40b6064107d63f228fe67a258dd1123b189