From: Larry Hastings <larry@hastings.org>
Date: Sun, 18 May 2014 04:05:10 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.4.1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a260d228b32b04a88d947b887bf81759e8e5f10;p=python

Merge.
---

3a260d228b32b04a88d947b887bf81759e8e5f10