From: Georg Brandl <georg@python.org>
Date: Tue, 14 Jan 2014 11:27:21 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0b3~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=738cb60f6529964392ef32c7401bad83076fa4e3;p=python

merge with 3.3
---

738cb60f6529964392ef32c7401bad83076fa4e3