merge 3.2

diff --cc Objects/unicodeobject.c
index 5c1071325d31cf5a4b672828f742b2a63cfec2c9,a5ffc56260a8d795c44df1d9f04641f863d2d34f..704de813e8372793e8bf7bd70c74b0848800be8a
--- 1/Objects/unicodeobject.c
--- 2/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -13173,17 -9208,12 +13173,13 @@@ unicode_getnewargs(PyObject *v
  }
  
  static PyMethodDef unicode_methods[] = {
- 
-     /* Order is according to common usage: often used methods should
-        appear first, since lookup is done sequentially. */
- 
      {"encode", (PyCFunction) unicode_encode, METH_VARARGS | METH_KEYWORDS, encode__doc__},
      {"replace", (PyCFunction) unicode_replace, METH_VARARGS, replace__doc__},
 -    {"split", (PyCFunction) unicode_split, METH_VARARGS, split__doc__},
 -    {"rsplit", (PyCFunction) unicode_rsplit, METH_VARARGS, rsplit__doc__},
 +    {"split", (PyCFunction) unicode_split, METH_VARARGS | METH_KEYWORDS, split__doc__},
 +    {"rsplit", (PyCFunction) unicode_rsplit, METH_VARARGS | METH_KEYWORDS, rsplit__doc__},
      {"join", (PyCFunction) unicode_join, METH_O, join__doc__},
      {"capitalize", (PyCFunction) unicode_capitalize, METH_NOARGS, capitalize__doc__},
 +    {"casefold", (PyCFunction) unicode_casefold, METH_NOARGS, casefold__doc__},
      {"title", (PyCFunction) unicode_title, METH_NOARGS, title__doc__},
      {"center", (PyCFunction) unicode_center, METH_VARARGS, center__doc__},
      {"count", (PyCFunction) unicode_count, METH_VARARGS, count__doc__},