From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 3 Feb 2014 14:20:22 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0rc1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae376e5ddc037825cf70adfbefeb2ac05123da52;p=python

Merge from 3.3
---

ae376e5ddc037825cf70adfbefeb2ac05123da52