From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 13 Jul 2013 00:10:48 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c92553d85b6d1d27c74fe47c7d84cb610de998b;p=python

Merge with 3.3
---

0c92553d85b6d1d27c74fe47c7d84cb610de998b