From: Victor Stinner <victor.stinner@gmail.com>
Date: Sat, 15 Jun 2013 01:37:45 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.0a1~502
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d016900080da070efbe71289e1f959c52b473ce6;p=python

Merge heads
---

d016900080da070efbe71289e1f959c52b473ce6