From: Gregory P. Smith <greg@krypto.org>
Date: Wed, 11 Dec 2013 02:26:02 +0000 (-0800)
Subject: null merge (3.4 doesn't need this fix)
X-Git-Tag: v3.4.0b2~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85cce1eac7a130412e7673208494f30c04bf4b33;p=thirdparty%2FPython%2Fcpython.git

null merge (3.4 doesn't need this fix)
---

85cce1eac7a130412e7673208494f30c04bf4b33