[xorg-x11-drv-nvidia-340xx/el6] (5 commits) ...Merge branch 'master' into el6