Merge 3.3.

author Stefan Krah <skrah@bytereef.org>

Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)

committer Stefan Krah <skrah@bytereef.org>

Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)
author Stefan Krah <skrah@bytereef.org>
Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)
committer Stefan Krah <skrah@bytereef.org>
Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)
diff --cc Include/osdefs.h
Simple merge
diff --cc Python/fileutils.c
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)
committer	Stefan Krah <skrah@bytereef.org>
	Mon, 12 Nov 2012 19:24:09 +0000 (20:24 +0100)
		1	2
Include/osdefs.h	patch \|	diff1 \|	diff2 \|	blob \| history
Python/fileutils.c	patch \|	diff1 \|	diff2 \|	blob \| history