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

merge 3.2 (null)
---

18b6751e3947be83fef92367d727bedef7ab41a7