From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Thu, 22 Dec 2011 07:46:44 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ad1af076c3e2b888c8b9401efe1201738e9962c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

5ad1af076c3e2b888c8b9401efe1201738e9962c