[mock-rpmfusion-nonfree: 7/7] Merge branch 'el6'