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

Merge 3.4.
---

af2bdbe4f8cb52efbc05fe7674361e8c4c8359b5