From: Andrew Kuchling <amk@amk.ca>
Date: Sat, 23 Nov 2013 01:18:26 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0b1~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd66cc5534ffb8fbdd071b2c453744562a16e818;p=python

Merge from 3.3
---

fd66cc5534ffb8fbdd071b2c453744562a16e818