Merged revisions 73725 via svnmerge from

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

................
  r73725 | benjamin.peterson | 2009-06-30 19:49:09 -0500 (Tue, 30 Jun 2009) | 21 lines

  Merged revisions 73379,73388,73507,73722 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r73379 | benjamin.peterson | 2009-06-11 18:06:21 -0500 (Thu, 11 Jun 2009) | 1 line

    use a real conditional expresion
  ........
    r73388 | benjamin.peterson | 2009-06-12 09:44:29 -0500 (Fri, 12 Jun 2009) | 1 line

    fix typo in last fix
  ........
    r73507 | benjamin.peterson | 2009-06-22 13:32:04 -0500 (Mon, 22 Jun 2009) | 1 line

    remove svn:executable property
  ........
    r73722 | benjamin.peterson | 2009-06-30 19:44:30 -0500 (Tue, 30 Jun 2009) | 1 line

    replace fail* with assert*
  ........
................