From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 8 Jun 2015 21:40:18 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0b3~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21fd5a92dee52a931cd42c324f3e0c7a9fe7d4be;p=python

Merge from 3.4
---

21fd5a92dee52a931cd42c324f3e0c7a9fe7d4be