Blocked revisions 79397 via svnmerge

........
  r79397 | larry.hastings | 2010-03-24 17:54:54 -0700 (Wed, 24 Mar 2010) | 4 lines

  Backported PyCapsule from 3.1, and converted most uses of
  CObject to PyCapsule.
........