Merge 3.2

author Alexandre Vassalotti <alexandre@peadrop.com>

Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)

committer Alexandre Vassalotti <alexandre@peadrop.com>

Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)
author Alexandre Vassalotti <alexandre@peadrop.com>
Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)
committer Alexandre Vassalotti <alexandre@peadrop.com>
Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)
diff --cc Lib/pickle.py
Simple merge
diff --cc Lib/pickletools.py
Simple merge
diff --cc Lib/test/pickletester.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_pickle.c
Simple merge
author	Alexandre Vassalotti <alexandre@peadrop.com>
	Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)
committer	Alexandre Vassalotti <alexandre@peadrop.com>
	Tue, 13 Dec 2011 18:22:42 +0000 (13:22 -0500)
		1	2
Lib/pickle.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/pickletools.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/pickletester.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_pickle.c	patch \|	diff1 \|	diff2 \|	blob \| history