From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jan 2014 15:24:59 +0000 (-0600)
Subject: null merge from 3.3
X-Git-Tag: v3.4.0b3~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9b77c5edf1f2f99b253bdd94661084dba03fe9b;p=thirdparty%2FPython%2Fcpython.git

null merge from 3.3
---

d9b77c5edf1f2f99b253bdd94661084dba03fe9b