From: Ned Deily <nad@acm.org>
Date: Wed, 18 Jun 2014 20:10:44 +0000 (-0700)
Subject: Issue #3485: merge from 3.4
X-Git-Tag: v3.5.0a1~1443^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=205a55f5c60c50ce9a064432fdf90036690e41a1;p=python

Issue #3485: merge from 3.4
---

205a55f5c60c50ce9a064432fdf90036690e41a1