[mock-rpmfusion-nonfree/el6] (16 commits) ...Merge branch 'el6'