From: Andrew Kuchling <amk@amk.ca>
Date: Tue, 14 Apr 2015 13:59:09 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a4~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=467a546b5ea4ca4112f3cc4ae1f7c0c39a8ad0cf;p=python

Merge from 3.4
---

467a546b5ea4ca4112f3cc4ae1f7c0c39a8ad0cf