From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 13 Apr 2013 15:09:52 +0000 (+0100)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~964
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bca5141f2de55cf363ec9ef7beacaf89942b3a45;p=python

Merge heads.
---

bca5141f2de55cf363ec9ef7beacaf89942b3a45