merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 04:05:25 +0000 (21:05 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 04:05:25 +0000 (21:05 -0700)
1  2 
Lib/test/test_unicode.py
Objects/unicodeobject.c

Simple merge
Simple merge