From: Richard Oudkerk <shibturn@gmail.com>
Date: Sat, 2 Nov 2013 17:08:01 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v3.4.0b1~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df0b14dad262eb9c0633f0b935f9cfbbc1bc530f;p=python

Merge.
---

df0b14dad262eb9c0633f0b935f9cfbbc1bc530f