From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 3 Dec 2011 22:10:12 +0000 (+0100)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~685
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=090d8132b50ebbe6b41073bdf0369c9673cc0c27;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2
---

090d8132b50ebbe6b41073bdf0369c9673cc0c27