From: Larry Hastings <larry@hastings.org>
Date: Sun, 8 Mar 2015 08:57:04 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.5.0a3~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=491dec6ac993a47bf54888e98e0d90c338c1c355;p=python

Merge.
---

491dec6ac993a47bf54888e98e0d90c338c1c355