Blocked revisions 65453 via svnmerge

........
  r65453 | brett.cannon | 2008-08-03 16:46:46 -0700 (Sun, 03 Aug 2008) | 3 lines

  Move filecmp from using dict.has_key() to dict.__contains__() to silence
  warnings triggered under -3.
........