From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 1 Sep 2011 20:33:56 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1586
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e35dc5110f25ab4c43d6d73affc5b212e9be0262;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

e35dc5110f25ab4c43d6d73affc5b212e9be0262