From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 16 Aug 2012 04:14:30 +0000 (+1000)
Subject: Merge str docstring fix from 3.2
X-Git-Tag: v3.3.0rc1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e41628d3583c03a6078d88c91a4ac80482f060b;p=python

Merge str docstring fix from 3.2
---

0e41628d3583c03a6078d88c91a4ac80482f060b