From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 30 Jun 2013 20:52:40 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14c4799581af0f9ec12b06ce2c59a6bd3676c9ee;p=python

Merge with 3.3
---

14c4799581af0f9ec12b06ce2c59a6bd3676c9ee