Merge pull request #413 from aldrik/master

Fix for alarm/marvell-libgfx conflicts
extra/mesa: pkgrel 2.1 instead of 3
alarm/xf86-video-dove: bump pkgrel
alarm/libcec-cubox to 2.1.1-1