From: Larry Hastings <larry@hastings.org>
Date: Sun, 8 Feb 2015 22:07:35 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.5.0a2~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df4fb13cdcbb375c4901158778aef6cc8cf9a255;p=python

Merge.
---

df4fb13cdcbb375c4901158778aef6cc8cf9a255