Merge with 3.3

author Terry Jan Reedy <tjreedy@udel.edu>

Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)

committer Terry Jan Reedy <tjreedy@udel.edu>

Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)
author Terry Jan Reedy <tjreedy@udel.edu>
Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)
committer Terry Jan Reedy <tjreedy@udel.edu>
Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)
diff --cc Lib/fileinput.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Terry Jan Reedy <tjreedy@udel.edu>
	Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)
committer	Terry Jan Reedy <tjreedy@udel.edu>
	Fri, 28 Jun 2013 22:59:52 +0000 (18:59 -0400)
		1	2
Lib/fileinput.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history