From: Dan Walsh <dwalsh@redhat.com>
Date: Tue, 6 Dec 2011 20:49:14 +0000 (-0500)
Subject: Merge branches 'master' and 'master' of ssh://git.fedorahosted.org/git/selinux-policy
X-Git-Tag: 000~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f543a90e2620cfbdc45711822fb1656fbe11cf42;p=people%2Fstevee%2Fselinux-policy.git

Merge branches 'master' and 'master' of ssh://git.fedorahosted.org/git/selinux-policy
---

f543a90e2620cfbdc45711822fb1656fbe11cf42