#6780: merge with 3.2.

author Ezio Melotti <ezio.melotti@gmail.com>

Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)

committer Ezio Melotti <ezio.melotti@gmail.com>

Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)
diff --cc Lib/test/test_bytes.py
Simple merge
diff --cc Lib/test/test_unicode.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/bytearrayobject.c
Simple merge
diff --cc Objects/bytesobject.c
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 26 Apr 2011 03:45:24 +0000 (06:45 +0300)
		1	2
Lib/test/test_bytes.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_unicode.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/bytearrayobject.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/bytesobject.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history