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

Merge with 3.3
---

b7bb6f571b0d760a503e18bb81ff2c6582159e2a