[selinux-policy: 2/4] Merge branches 'master', 'master', 'master', 'master', 'master' and 'master' of ssh://pkgs.fedorapro

[Daniel J Walsh]

commit 1586b9fc45b213dafb1523d38ddeb4e871aaee6a
Merge: 5b0fcdd b63541e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Nov 29 12:12:03 2010 -0500

    Merge branches 'master', 'master', 'master', 'master', 'master' and 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

 .gitignore          |    1 +
 policy-F15.patch    | 1428 ++++++++++++++++++++++-----------------------------
 selinux-policy.spec |   12 +-
 sources             |    2 +-
 4 files changed, 634 insertions(+), 809 deletions(-)
---