Merge with 3.3

author Andrew Kuchling <amk@amk.ca>

Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)

committer Andrew Kuchling <amk@amk.ca>

Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)
author Andrew Kuchling <amk@amk.ca>
Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)
committer Andrew Kuchling <amk@amk.ca>
Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)
diff --cc Doc/library/functions.rst
Simple merge
diff --cc Modules/_io/textio.c
Simple merge
author	Andrew Kuchling <amk@amk.ca>
	Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)
committer	Andrew Kuchling <amk@amk.ca>
	Sun, 16 Jun 2013 17:02:55 +0000 (13:02 -0400)
		1	2
Doc/library/functions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_io/textio.c	patch \|	diff1 \|	diff2 \|	blob \| history