From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 27 Jan 2014 02:35:22 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0rc1~229^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c5b5d457103d44dc016a85083455ac9e08e1675;p=python

Merge with 3.3
---

0c5b5d457103d44dc016a85083455ac9e08e1675