Blocked revisions 88507 via svnmerge

........
  r88507 | brett.cannon | 2011-02-22 12:17:14 -0800 (Tue, 22 Feb 2011) | 1 line

  Fix test.test_crypt.test_methods() to pass on OS X.
........