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

Merge from 3.4
---

6b84335adae7d95b846f31014aeeeb6c533d89d4