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

Merge with 3.3
---

06beaba785b78cc89986b447ef2bb7be4f7a7696