From: Andrew Kuchling <amk@amk.ca>
Date: Sat, 22 Jun 2013 23:27:59 +0000 (-0400)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~424
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e03d6f2e91ede8e66442086484e76afad1702c0;p=python

Merge from 3.3
---

0e03d6f2e91ede8e66442086484e76afad1702c0