Merge with 3.4

author Terry Jan Reedy <tjreedy@udel.edu>

Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)

committer Terry Jan Reedy <tjreedy@udel.edu>

Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)
author Terry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)
committer Terry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)
diff --cc Lib/turtledemo/__main__.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Terry Jan Reedy <tjreedy@udel.edu>
	Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)
committer	Terry Jan Reedy <tjreedy@udel.edu>
	Wed, 23 Jul 2014 19:01:29 +0000 (15:01 -0400)
		1	2
Lib/turtledemo/__main__.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history