Merge a newer version of libffi_osx, based on the
version of libffi in OSX 10.6.1.

This fixes issue6918
8 files changed