From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 30 Jul 2013 05:37:28 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bcbdf15481ba26ccb52d2dda2719908002bf56b;p=python

Merge with 3.3
---

5bcbdf15481ba26ccb52d2dda2719908002bf56b