From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 17 Mar 2013 19:29:19 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15cddb498ec8e8d780384c2d459557012b2c9eea;p=python

Merge with 3.3
---

15cddb498ec8e8d780384c2d459557012b2c9eea