From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 31 Jul 2013 02:31:30 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~37^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92e2a220ef3d5d8250bbd7aa7e2768ee220c95dd;p=python

Merge with 3.3
---

92e2a220ef3d5d8250bbd7aa7e2768ee220c95dd