From: Larry Hastings <larry@hastings.org>
Date: Mon, 19 May 2014 06:20:45 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.5.0a1~1630
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f87379063d69dff0fb264a8605dc1eb8b711851b;p=python

Merge.
---

f87379063d69dff0fb264a8605dc1eb8b711851b