Merge with 3.4

author Terry Jan Reedy <tjreedy@udel.edu>

Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)

committer Terry Jan Reedy <tjreedy@udel.edu>

Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)
author Terry Jan Reedy <tjreedy@udel.edu>
Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)
committer Terry Jan Reedy <tjreedy@udel.edu>
Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)
diff --cc Doc/library/site.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Terry Jan Reedy <tjreedy@udel.edu>
	Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)
committer	Terry Jan Reedy <tjreedy@udel.edu>
	Tue, 29 Apr 2014 04:32:17 +0000 (00:32 -0400)
		1	2
Doc/library/site.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history