From: Ned Deily <nad@acm.org>
Date: Fri, 28 Mar 2014 03:51:15 +0000 (-0700)
Subject: Issue #17654: merge from 3.4
X-Git-Tag: v3.5.0a1~2008
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c318288f69e11c537baeca6799c212e8dd294b85;p=python

Issue #17654: merge from 3.4
---

c318288f69e11c537baeca6799c212e8dd294b85