merge with 3.3

author Georg Brandl <georg@python.org>

Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)

committer Georg Brandl <georg@python.org>

Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)
author Georg Brandl <georg@python.org>
Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)
committer Georg Brandl <georg@python.org>
Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)
diff --cc PC/VS9.0/pyproject.vsprops
Simple merge
diff --cc PCbuild/pyproject.props
Simple merge
diff --cc PCbuild/readme.txt
Simple merge
author	Georg Brandl <georg@python.org>
	Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)
committer	Georg Brandl <georg@python.org>
	Sun, 12 May 2013 17:57:26 +0000 (19:57 +0200)
		1	2
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