From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 5 Dec 2011 00:47:40 +0000 (+0100)
Subject: Merge assorted fixes from 3.2
X-Git-Tag: v3.3.0a1~677
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3731142e190b63ac2a505727329dc0d527346037;p=thirdparty%2FPython%2Fcpython.git

Merge assorted fixes from 3.2
---

3731142e190b63ac2a505727329dc0d527346037