Blocked revisions 69354 via svnmerge

................
  r69354 | benjamin.peterson | 2009-02-05 21:01:24 -0600 (Thu, 05 Feb 2009) | 17 lines

  Merged revisions 69141,69211-69212 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r69141 | benjamin.peterson | 2009-01-31 14:01:48 -0600 (Sat, 31 Jan 2009) | 1 line

    fix indentation
  ........
    r69211 | guilherme.polo | 2009-02-02 14:23:29 -0600 (Mon, 02 Feb 2009) | 1 line

    Restore the previous geometry before leaving the test
  ........
    r69212 | guilherme.polo | 2009-02-02 14:28:59 -0600 (Mon, 02 Feb 2009) | 1 line

    Moving to importlib
  ........
................