From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 3 Jan 2012 22:48:14 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=332503db07ab5f8c2dea301a7ec9b8f7d4f1152f;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

332503db07ab5f8c2dea301a7ec9b8f7d4f1152f