From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 20 Mar 2014 12:43:50 +0000 (+0000)
Subject: Merged from 3.4.
X-Git-Tag: v3.5.0a1~2069^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f9f0e23a1e68190eb0d9938d16f10fe809daf09;p=python

Merged from 3.4.
---

9f9f0e23a1e68190eb0d9938d16f10fe809daf09