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

Merge from 3.3
---

6ce8d17d02bf1e39265d6c77fe5a851cb38cefd6