Blocked revisions 80492 via svnmerge

........
  r80492 | brett.cannon | 2010-04-25 15:33:36 -0700 (Sun, 25 Apr 2010) | 6 lines

  When DeprecationWarning was silenced by default, it also silenced any use of -Q
  by default as well. This change fixes that by treating -Q like -3 when it comes
  to DeprecationWarning; using it causes the silencing to not occur.

  Fixes issue #7319.
........