From: Andrew Kuchling <amk@amk.ca>
Date: Fri, 10 May 2013 00:14:01 +0000 (-0400)
Subject: #17700: merge with 3.3
X-Git-Tag: v3.4.0a1~757
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40e39fc8b8a35da76fb6de166dd023446f44625b;p=python

#17700: merge with 3.3
---

40e39fc8b8a35da76fb6de166dd023446f44625b