commit 3af504b2d143cc49e72138fef785ab4120d51bc1 Merge: 6554bb3 62760c4 Author: Dan Walsh <dwalsh at redhat.com> Date: Tue Oct 11 16:48:17 2011 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy Conflicts: selinux-policy.spec ---