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

Merge from 3.3
---

f862dc53e873e6fd655aa2872cc0081ab8d43e91