Merge from trunk:

------------------------------------------------------------------------
r88350 | shane | 2008-07-14 16:20:39 +0200 (Mon, 14 Jul 2008) | 2 lines

Made compatible with Python 2.5 on 64 bit architectures.  See PEP 353.

------------------------------------------------------------------------

CHANGES.txt

@@ -5,7 +5,7 @@ CHANGES
 3.5.5dev (unreleased)
 ---------------------
 
-- 
+- Made C code compatible with Python 2.5 on 64bit architectures.
 
 3.5.4 (2008-07-16)
 ---------------------

src/zope/app/container/_zope_proxy_proxy.c

@@ -612,20 +612,20 @@ wrap_nonzero(PyObject *self)
  *   Sequence methods
  */
 
-static int
+static Py_ssize_t
 wrap_length(PyObject *self)
 {
     return PyObject_Length(Proxy_GET_OBJECT(self));
 }
 
 static PyObject *
-wrap_slice(PyObject *self, int start, int end)
+wrap_slice(PyObject *self, Py_ssize_t start, Py_ssize_t end)
 {
     return PySequence_GetSlice(Proxy_GET_OBJECT(self), start, end);
 }
 
 static int
-wrap_ass_slice(PyObject *self, int i, int j, PyObject *value)
+wrap_ass_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j, PyObject *value)
 {
     return PySequence_SetSlice(Proxy_GET_OBJECT(self), i, j, value);
 }