From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Wed, 21 Nov 2012 13:34:26 +0000 (-0800)
Subject: Null merge from 3.2.
X-Git-Tag: v3.3.1rc1~608
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbc32f6d52b9164c1ec31640e86a64964dbef735;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.2.
---

fbc32f6d52b9164c1ec31640e86a64964dbef735