From: Michael Foord <michael@voidspace.org.uk>
Date: Tue, 29 Jan 2013 23:18:48 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.4.0a1~1495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beb29b1f6c7f3622687d498f3f5d3fb47adf25f6;p=python

Merge
---

beb29b1f6c7f3622687d498f3f5d3fb47adf25f6