From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 15 Aug 2013 20:19:33 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a2~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0db895e752fd2c1d71636e0630f423c1795f1bd1;p=python

Merge with 3.3
---

0db895e752fd2c1d71636e0630f423c1795f1bd1