From: Brian Curtin <brian@python.org>
Date: Wed, 1 Feb 2012 21:15:14 +0000 (-0600)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~270
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b