From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 29 May 2013 02:22:14 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~609
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b503965a0c19c1a19d244e15b74cb0964f08c3c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

7b503965a0c19c1a19d244e15b74cb0964f08c3c