merge 3.3

diff --cc Objects/bytesobject.c
index 6eb61e3527527d5d01296d4fe828ed8e9fe29c99,32c5d71ecd1c9d952c0af3b7b62db6901c03b22e..4a8561cf2f39672c7220bae57055a443ea792e8c
--- 1/Objects/bytesobject.c
--- 2/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -592,9 -582,9 +592,9 @@@ PyBytes_AsStringAndSize(PyObject *obj
  PyObject *
  PyBytes_Repr(PyObject *obj, int smartquotes)
  {
 -    register PyBytesObject* op = (PyBytesObject*) obj;
 +    PyBytesObject* op = (PyBytesObject*) obj;
      Py_ssize_t i, length = Py_SIZE(op);
-     size_t newsize, squotes, dquotes;
+     Py_ssize_t newsize, squotes, dquotes;
      PyObject *v;
      unsigned char quote, *s, *p;