From: Andrew Kuchling <amk@amk.ca>
Date: Tue, 19 Nov 2013 16:06:44 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0b1~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e60f85ce45f119121386adc2527fe66c349b46d;p=python

Merge from 3.3
---

0e60f85ce45f119121386adc2527fe66c349b46d