From: Larry Hastings <larry@hastings.org>
Date: Mon, 19 May 2014 06:19:55 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.4.2rc1~523
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=debcb9dd542e06fa8e6fe6f1fb8c4549ae9ddeea;p=python

Merge.
---

debcb9dd542e06fa8e6fe6f1fb8c4549ae9ddeea