Merge with main repo default branch.

author Georg Brandl <georg@python.org>

Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)

committer Georg Brandl <georg@python.org>

Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)
author Georg Brandl <georg@python.org>
Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)
committer Georg Brandl <georg@python.org>
Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)
diff --cc Doc/library/urllib.parse.rst
Simple merge
diff --cc Doc/whatsnew/3.3.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Georg Brandl <georg@python.org>
	Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)
committer	Georg Brandl <georg@python.org>
	Sat, 29 Sep 2012 07:27:15 +0000 (09:27 +0200)
		1	2
Doc/library/urllib.parse.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/whatsnew/3.3.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history