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

Merge from 3.3
---

3468d25a80b6d080b2a90d596ba4c3f6c2618d39