From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Mar 2012 18:02:10 +0000 (-0700)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~234^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bebcd18b75b019406019a771a54e96fd1bca54cb;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

bebcd18b75b019406019a771a54e96fd1bca54cb