dc571e9 fix Conflicts for selinux policy

Authored and Committed by rmeggins 13 years ago
    fix Conflicts for selinux policy
    
        
file modified
+5 -2