Merged revisions 79894-79895,80098,80120 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79894 | jeroen.ruigrok | 2010-04-07 09:33:37 -0500 (Wed, 07 Apr 2010) | 5 lines

  FreeBSD is not a sysv platform, so use freebsd.S instead of sysv.S (as is
  also the case in FreeBSD's port of libffi).

  Reviewed by: dickinsm
........
  r79895 | jeroen.ruigrok | 2010-04-07 11:34:08 -0500 (Wed, 07 Apr 2010) | 2 lines

  Document the libffi FreeBSD fix.
........
  r80098 | benjamin.peterson | 2010-04-15 16:42:16 -0500 (Thu, 15 Apr 2010) | 1 line

  add space
........
  r80120 | antoine.pitrou | 2010-04-16 16:34:02 -0500 (Fri, 16 Apr 2010) | 3 lines

  Ignore jinja2
........
2 files changed