Blocked revisions 80546-80547 via svnmerge

........
  r80546 | benjamin.peterson | 2010-04-27 16:15:28 -0500 (Tue, 27 Apr 2010) | 1 line

  fix comment
........
  r80547 | benjamin.peterson | 2010-04-27 16:17:22 -0500 (Tue, 27 Apr 2010) | 1 line

  fold __future__ imports
........