[mock-rpmfusion-free: 6/6] Merge branch 'el6'