From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 Mar 2013 12:58:16 +0000 (-0400)
Subject: merge 3.3 (#17550)
X-Git-Tag: v3.4.0a1~1086
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fccfb824e60ad5871f76d889159bd1ff4a16b81b;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#17550)
---

fccfb824e60ad5871f76d889159bd1ff4a16b81b