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

Merge with 3.3
---

a92bfa457cd35443c340fa9931055899bab2b618