#17425: merge 3.3

author Martin v. Löwis <martin@v.loewis.de>

Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)

committer Martin v. Löwis <martin@v.loewis.de>

Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)
author Martin v. Löwis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)
committer Martin v. Löwis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)
diff --cc Misc/NEWS
Simple merge
diff --cc PC/VS9.0/pyproject.vsprops
Simple merge
diff --cc PCbuild/pyproject.props
Simple merge
diff --cc PCbuild/readme.txt
Simple merge
author	Martin v. Löwis <martin@v.loewis.de>
	Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)
committer	Martin v. Löwis <martin@v.loewis.de>
	Sun, 24 Mar 2013 21:53:04 +0000 (22:53 +0100)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
PC/VS9.0/pyproject.vsprops	patch \|	diff1 \|	diff2 \|	blob \| history
PCbuild/pyproject.props	patch \|	diff1 \|	diff2 \|	blob \| history
PCbuild/readme.txt	patch \|	diff1 \|	diff2 \|	blob \| history