Issue #21311: merge with 3.4

author Ned Deily <nad@acm.org>

Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)

committer Ned Deily <nad@acm.org>

Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)
author Ned Deily <nad@acm.org>
Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)
committer Ned Deily <nad@acm.org>
Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ned Deily <nad@acm.org>
	Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)
committer	Ned Deily <nad@acm.org>
	Sat, 19 Apr 2014 20:27:06 +0000 (13:27 -0700)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history