MERGE: Closes #15396: memory leak in tkinter

author Jesus Cea <jcea@jcea.es>

Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)

committer Jesus Cea <jcea@jcea.es>

Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)
author Jesus Cea <jcea@jcea.es>
Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)
committer Jesus Cea <jcea@jcea.es>
Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)
diff --cc Doc/ACKS.txt
Simple merge
diff --cc Modules/_tkinter.c
Simple merge
author	Jesus Cea <jcea@jcea.es>
	Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)
committer	Jesus Cea <jcea@jcea.es>
	Thu, 19 Jul 2012 19:18:45 +0000 (21:18 +0200)
		1	2
Doc/ACKS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_tkinter.c	patch \|	diff1 \|	diff2 \|	blob \| history