From: Ned Deily <nad@acm.org>
Date: Thu, 27 Mar 2014 23:44:06 +0000 (-0700)
Subject: Issue #6676: merge from 3.4
X-Git-Tag: v3.5.0a1~2009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=090eb1fd18f7cdd753b6fc9b60162491ee48f04e;p=python

Issue #6676: merge from 3.4
---

090eb1fd18f7cdd753b6fc9b60162491ee48f04e