From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 18 Aug 2013 22:58:27 +0000 (-0400)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a2~188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46aace343f4b426b79b99157ebe4878fb88bf578;p=python

Merge from 3.3
---

46aace343f4b426b79b99157ebe4878fb88bf578