From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 3 Apr 2013 16:45:47 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1035
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd4bba1bf3c288add3009aad59c3ec8558dca9b4;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

fd4bba1bf3c288add3009aad59c3ec8558dca9b4