From: Anthony Green <green@moxielogic.com>
Date: Tue, 30 Oct 2012 17:37:37 +0000 (-0400)
Subject: Fix commit conflicts
X-Git-Tag: v3.0.12~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ccd51be1fdeb99f8b4f42f905166c2abbba8ac0;p=platform%2Fupstream%2Flibffi.git

Fix commit conflicts
---

9ccd51be1fdeb99f8b4f42f905166c2abbba8ac0