From: Georg Brandl <georg@python.org>
Date: Sat, 11 Jan 2014 19:04:29 +0000 (+0100)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0b3~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=932c3458df7332658de80835a78a781ab60fdb1e;p=python

Merge with 3.3
---

932c3458df7332658de80835a78a781ab60fdb1e