From: Ned Deily <nad@acm.org>
Date: Sat, 2 Feb 2013 08:20:50 +0000 (-0800)
Subject: Issue #15116: merge from 3.3
X-Git-Tag: v3.4.0a1~1475^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dfacb77426a4843f454ff90867ef2057e0871de;p=thirdparty%2FPython%2Fcpython.git

Issue #15116: merge from 3.3
---

0dfacb77426a4843f454ff90867ef2057e0871de