Blocked revisions 70153 via svnmerge

........
  r70153 | brett.cannon | 2009-03-03 17:00:53 -0800 (Tue, 03 Mar 2009) | 4 lines

  Fix some more bugs caused by the backport from 3.x for importlib.
  Do a more exact copy of the final 3.x code to resolve bugs and add
  appropriate tests.
........