#16306: merge with 3.3.

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

Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)

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

Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)
diff --cc Lib/test/test_cmd_line.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Sun, 18 Nov 2012 12:06:54 +0000 (14:06 +0200)
		1	2
Lib/test/test_cmd_line.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history