From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 16 Mar 2013 19:57:27 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1188^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b8df5a8fb9f660d8276cf64ed43439bba236829;p=python

Merge with 3.3
---

8b8df5a8fb9f660d8276cf64ed43439bba236829