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

Merge 3.4.
---

bd153de4a492b7b7f6b034745c52f4248fa653bd