Blocked revisions 79078,79086 via svnmerge

........
  r79078 | benjamin.peterson | 2010-03-18 18:12:43 -0500 (Thu, 18 Mar 2010) | 1 line

  make compiler's py3k warning a full deprecation warning #6837
........
  r79086 | benjamin.peterson | 2010-03-18 20:06:33 -0500 (Thu, 18 Mar 2010) | 1 line

  keep DeprecationWarning from failing test
........