From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 13 Jul 2013 00:17:00 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4064b2448c919ef5842211be140d18b2e5bcdff6;p=python

Merge with 3.3
---

4064b2448c919ef5842211be140d18b2e5bcdff6