From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 5 Jun 2013 18:23:53 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~562
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a55d703e1eb1df3c00e257e52601d02dacc5305e;p=python

Merge with 3.3
---

a55d703e1eb1df3c00e257e52601d02dacc5305e