Recorded merge of revisions 75103-75104,75106 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75103 | kristjan.jonsson | 2009-09-28 14:08:48 +0100 (Mon, 28 Sep 2009) | 2 lines

  http://bugs.python.org/issue6836
  A memory block allocated with one API was being handed over to an object that used another API to release it.
........
  r75104 | kristjan.jonsson | 2009-09-28 14:12:38 +0100 (Mon, 28 Sep 2009) | 2 lines

  http://bugs.python.org/issue6836
  The debug memory api now keeps track of which external API (PyMem_* or PyObject_*) was used to allocate each block and treats any API violation as an error.  Added separate _PyMem_DebugMalloc functions for the Py_Mem API instead of having it use the _PyObject_DebugMalloc functions.
........
  r75106 | kristjan.jonsson | 2009-09-28 16:56:25 +0100 (Mon, 28 Sep 2009) | 2 lines

  http://bugs.python.org/issue6836
  A missing 'const' wasn't detected by Visual Studio.
........