From: Larry Hastings <larry@hastings.org>
Date: Mon, 17 Mar 2014 06:01:31 +0000 (-0700)
Subject: Merge from 3.4 into default.
X-Git-Tag: v3.5.0a1~2112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dc931037b472931f2a96b8525bced6d6d0dc791;p=python

Merge from 3.4 into default.
---

8dc931037b472931f2a96b8525bced6d6d0dc791