From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Feb 2012 13:47:04 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~202^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67e700697e2384ac7972674f74bd6913f85e81ee;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

67e700697e2384ac7972674f74bd6913f85e81ee