From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 4 Jul 2011 03:19:29 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1966
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=401d197657550f0ac155e96213b328a70724d2fa;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

401d197657550f0ac155e96213b328a70724d2fa