From: Andrew Kuchling <amk@amk.ca>
Date: Tue, 12 Nov 2013 15:03:20 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0b1~307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7150787b7ebbc1bf42e5da2da25f0b323076cdc1;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3
---

7150787b7ebbc1bf42e5da2da25f0b323076cdc1