From: Gregory P. Smith <greg@krypto.org>
Date: Mon, 2 Dec 2013 01:28:24 +0000 (-0800)
Subject: null merge (3.4 already has its own fix for this).
X-Git-Tag: v3.4.0b2~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e6429a2cdad9ed9698013aca0066e23745a1132;p=python

null merge (3.4 already has its own fix for this).
---

6e6429a2cdad9ed9698013aca0066e23745a1132