From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Sep 2012 15:03:27 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~818^2^2~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d79ac0fad7d125d081194981e8bd17b1528a8bfc;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

d79ac0fad7d125d081194981e8bd17b1528a8bfc