From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Wed, 5 Oct 2011 20:37:06 +0000 (+0200)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~1303
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3484c09c97141f497de9f99c5d2135e41fde8a11;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2
---

3484c09c97141f497de9f99c5d2135e41fde8a11