From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jan 2012 02:28:13 +0000 (-0500)
Subject: merge 3.2 (#13766)
X-Git-Tag: v3.3.0a1~394
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c6bab1c24e8796b93739350c8c78cdc59efd3b3;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#13766)
---

0c6bab1c24e8796b93739350c8c78cdc59efd3b3