Blocked revisions 78690 via svnmerge

........
  r78690 | mark.dickinson | 2010-03-05 14:36:20 +0000 (Fri, 05 Mar 2010) | 3 lines

  Fix incorrect stacklevel for DeprecationWarnings originating from the struct module.
  Also clean up related tests in test_struct.
  The stacklevel fix should be backported to 2.6 once that branch is unfrozen.
........