Merge: closes issue 16643 (not ....2 as in last commit message)

author Terry Jan Reedy <tjreedy@udel.edu>

Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)

committer Terry Jan Reedy <tjreedy@udel.edu>

Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)
author Terry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)
committer Terry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Terry Jan Reedy <tjreedy@udel.edu>
	Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)
committer	Terry Jan Reedy <tjreedy@udel.edu>
	Sat, 9 Mar 2013 07:19:33 +0000 (02:19 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history