From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 16 Apr 2014 20:17:16 +0000 (-0400)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9;p=python

merge 3.4
---

3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9