Merge branch 'prepare-ffi-migration' into merge_ffi
authorJean Privat <jean@pryen.org>
Mon, 17 Feb 2014 15:42:44 +0000 (10:42 -0500)
committerJean Privat <jean@pryen.org>
Mon, 17 Feb 2014 15:42:44 +0000 (10:42 -0500)

Trivial merge