Merged revisions 69617 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69617 | benjamin.peterson | 2009-02-14 10:51:03 -0600 (Sat, 14 Feb 2009) | 1 line

  we're no longer using CVS, so this doesn't have to be binary
........