From: Richard Oudkerk <shibturn@gmail.com>
Date: Sun, 23 Mar 2014 18:53:53 +0000 (+0000)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0a1~2042
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91e7f04fc55523b339209dc6fb7702d3cf6bade4;p=python

Merge 3.4.
---

91e7f04fc55523b339209dc6fb7702d3cf6bade4