Unblocked revisions 78814,79049 via svnmerge

........
  r78814 | raymond.hettinger | 2010-03-09 13:29:10 +0200 (Tue, 09 Mar 2010) | 1 line

  Improve code clarity a bit.
........
  r79049 | florent.xicluna | 2010-03-18 21:51:47 +0200 (Thu, 18 Mar 2010) | 2 lines

  #8155: Preserve backward compatibility for test_support.check_warnings().  Add regression tests.
........