From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 15 Feb 2012 21:31:23 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.3rc1~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23357eb4d6becc93728b83c1fed9fe03e100bcfa;p=thirdparty%2FPython%2Fcpython.git

Merge
---

23357eb4d6becc93728b83c1fed9fe03e100bcfa