Merge AIX fixes from 3.6

author Martin Panter <vadmium+py@gmail.com>

Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)
author Martin Panter <vadmium+py@gmail.com>
Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)
diff --cc Misc/ACKS
Simple merge
diff --cc Modules/socketmodule.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Mon, 14 Nov 2016 05:04:36 +0000 (05:04 +0000)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/socketmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history