Merged revisions 80548-80549 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80548 | benjamin.peterson | 2010-04-27 16:18:30 -0500 (Tue, 27 Apr 2010) | 1 line

  condense import
........
  r80549 | benjamin.peterson | 2010-04-27 16:19:06 -0500 (Tue, 27 Apr 2010) | 1 line

  correct signature
........
1 file changed