Merge from 3.3.

author Stefan Krah <skrah@bytereef.org>

Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)

committer Stefan Krah <skrah@bytereef.org>

Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)
author Stefan Krah <skrah@bytereef.org>
Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)
committer Stefan Krah <skrah@bytereef.org>
Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)
diff --cc Misc/ACKS
Simple merge
diff --cc Python/fileutils.c
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)
committer	Stefan Krah <skrah@bytereef.org>
	Mon, 20 Jan 2014 14:35:38 +0000 (15:35 +0100)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/fileutils.c	patch \|	diff1 \|	diff2 \|	blob \| history