merge heads.

author Gregory P. Smith <greg@krypto.org>

Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)

committer Gregory P. Smith <greg@krypto.org>

Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)
author Gregory P. Smith <greg@krypto.org>
Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)
committer Gregory P. Smith <greg@krypto.org>
Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/socketmodule.c
Simple merge
author	Gregory P. Smith <greg@krypto.org>
	Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)
committer	Gregory P. Smith <greg@krypto.org>
	Sun, 5 Jun 2011 06:05:19 +0000 (23:05 -0700)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/socketmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history