Merge heads

author Serhiy Storchaka <storchaka@gmail.com>

Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)

committer Serhiy Storchaka <storchaka@gmail.com>

Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)
author Serhiy Storchaka <storchaka@gmail.com>
Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)
committer Serhiy Storchaka <storchaka@gmail.com>
Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)
diff --cc Lib/tkinter/__init__.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Serhiy Storchaka <storchaka@gmail.com>
	Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)
committer	Serhiy Storchaka <storchaka@gmail.com>
	Wed, 2 Jan 2013 08:37:54 +0000 (10:37 +0200)
		1	2
Lib/tkinter/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history