#15796: merge with 3.2.

author Ezio Melotti <ezio.melotti@gmail.com>

Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)

committer Ezio Melotti <ezio.melotti@gmail.com>

Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
diff --cc Modules/_io/_iomodule.c
Simple merge
diff --cc Modules/_io/iobase.c
Simple merge
diff --cc Modules/_io/textio.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
		1	2
Modules/_io/_iomodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_io/iobase.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_io/textio.c	patch \|	diff1 \|	diff2 \|	blob \| history