Merge branch 'master' of http://git.fedorahosted.org/git/selinux-policy

author Dan Walsh <dwalsh@redhat.com>

Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)

committer Dan Walsh <dwalsh@redhat.com>

Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)
author Dan Walsh <dwalsh@redhat.com>
Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)
committer Dan Walsh <dwalsh@redhat.com>
Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)
diff --cc policy/modules/kernel/terminal.if
Simple merge
diff --cc policy/modules/services/ssh.if
Simple merge
diff --cc policy/modules/system/userdomain.if
Simple merge
author	Dan Walsh <dwalsh@redhat.com>
	Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)
committer	Dan Walsh <dwalsh@redhat.com>
	Fri, 15 Apr 2011 13:23:59 +0000 (09:23 -0400)
		1	2
policy/modules/kernel/terminal.if	patch \|	diff1 \|	diff2 \|	blob \| history
policy/modules/services/ssh.if	patch \|	diff1 \|	diff2 \|	blob \| history
policy/modules/system/userdomain.if	patch \|	diff1 \|	diff2 \|	blob \| history