[selinux-policy: 2/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

[Daniel J Walsh]

commit 3ba95111e07d3482bb4a16009ab4f8e3263f4c30
Merge: 4ee59fd 0368b4c
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Jan 7 08:44:03 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

 modules-targeted-contrib.conf |   20 +++++++-------------
 selinux-policy.spec           |    4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)
---