From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 11 Jan 2012 19:14:14 +0000 (-0500)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~441^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a825ba3c655bbfb0a4dc4794e0f9f15b1dfd179;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
#11633 Clarify print buffering (will change again if 13761 adds flush param).
---

7a825ba3c655bbfb0a4dc4794e0f9f15b1dfd179