From: Georg Brandl <georg@python.org>
Date: Tue, 26 Nov 2013 07:25:45 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0b2~472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5831882c086cab0968e988c8bbe9548ea71b8e7e;p=python

merge with 3.3
---

5831882c086cab0968e988c8bbe9548ea71b8e7e