From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 3 Apr 2013 16:35:25 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1036
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=670e1b7b1e8be7e2817cf74cd92dccae776a8164;p=python

Merge with 3.3
---

670e1b7b1e8be7e2817cf74cd92dccae776a8164