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

merge 3.2
---

518cf94ad79503fb16475ccc29592b390e7b19da