alarm/marvell-libgfx: workaround for mesa 9.1-2 conflicts
Merge pull request #413 from aldrik/master

Fix for alarm/marvell-libgfx conflicts