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

Merge with 3.3
---

7afadc856b2f0d960250a0e5924b6b69e6abc417