From: Frank Wierzbicki <fwierzbicki@gmail.com>
Date: Wed, 16 Jan 2013 22:10:36 +0000 (-0800)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb17b4a90f13d60261e08b70f7b07987142f4536;p=python

merge with 3.3
---

bb17b4a90f13d60261e08b70f7b07987142f4536