From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 15:54:28 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.3rc1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba528f57caea59841be8785ee7b0bc28293d47b1;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

ba528f57caea59841be8785ee7b0bc28293d47b1