Merge branch 'jfc-darcs-cffi' into jfc-new-cffi-foreign-types