From: Andrew Kuchling <amk@amk.ca>
Date: Thu, 20 Jun 2013 13:51:51 +0000 (-0400)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aed567f2b99c7fa738ce875b4adc36c5cf32622;p=python

Merge from 3.3
---

7aed567f2b99c7fa738ce875b4adc36c5cf32622