#17809: merge with 3.3.

author Ezio Melotti <ezio.melotti@gmail.com>

Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)

committer Ezio Melotti <ezio.melotti@gmail.com>

Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)
diff --cc Lib/test/test_posixpath.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 9 May 2013 12:24:30 +0000 (15:24 +0300)
		1	2
Lib/test/test_posixpath.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history