Merged revisions 78965 via svnmerge from

Merged revisions 78965 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78965 | benjamin.peterson | 2010-03-14 10:18:25 -0500 (Sun, 14 Mar 2010) | 13 lines

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

  ........
    r78962 | benjamin.peterson | 2010-03-14 09:24:31 -0500 (Sun, 14 Mar 2010) | 1 line

    fix freebsd linking #7705
  ........
    r78964 | benjamin.peterson | 2010-03-14 10:06:14 -0500 (Sun, 14 Mar 2010) | 1 line

    fix quotes
  ........
................