[mesa-freeworld/rpmfusion_fixes: 2/2] Re-introduce Conflicts - rfbz#6612