Merge branch 'master' of github.com:/atgreen/libffi
authorAnthony Green <green@moxielogic.com>
Sat, 16 Mar 2013 12:20:40 +0000 (08:20 -0400)
committerAnthony Green <green@moxielogic.com>
Sat, 16 Mar 2013 12:20:40 +0000 (08:20 -0400)
Conflicts:
ChangeLog


Trivial merge