From: Larry Hastings <larry@hastings.org>
Date: Mon, 9 Mar 2015 09:40:13 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.5.0a3~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=551719be4a213494a6052bd3988746e097cd7947;p=python

Merge.
---

551719be4a213494a6052bd3988746e097cd7947