From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 30 Jan 2012 01:17:07 +0000 (-0500)
Subject: merge 3.2 (closes #13908)
X-Git-Tag: v3.3.0a1~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2372bb07221a44df0bed6a237e243ea36d92906e;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (closes #13908)
---

2372bb07221a44df0bed6a237e243ea36d92906e