From: Éric Araujo Date: Wed, 23 Mar 2011 03:40:51 +0000 (+0100) Subject: Merge from 3.2. X-Git-Tag: v3.3.0a1~2786^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97054cf0b5b5a41ba07474e247057b808236845b;p=thirdparty%2FPython%2Fcpython.git Merge from 3.2. The fix was already present in 3.3, but I merged two small changes recommended by Raymond while I was working on the 2.7 patch to ease future merges. --- 97054cf0b5b5a41ba07474e247057b808236845b