[selinux-policy: 3120/3172] Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

[Daniel J Walsh]

commit 55bffb71897452166a4a42e3a5f7fa591aec04b0
Merge: 7c94a3a a5ea149
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Sep 23 17:20:36 2010 -0400

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

 policy/modules/kernel/corecommands.fc     |    3 +-
 policy/modules/services/nagios.te         |    2 +-
 policy/modules/services/ntop.te           |    2 +-
 policy/modules/services/nx.te             |   10 ++--
 policy/modules/services/oddjob.te         |    3 -
 policy/modules/services/oident.te         |   10 ++--
 policy/modules/services/openvpn.te        |   15 ++---
 policy/modules/services/pads.te           |   11 ++--
 policy/modules/services/passenger.te      |    4 +-
 policy/modules/services/pcscd.te          |    1 -
 policy/modules/services/pegasus.te        |    4 +-
 policy/modules/services/pingd.te          |    2 +-
 policy/modules/services/piranha.te        |   22 +++-----
 policy/modules/services/plymouthd.te      |    2 +-
 policy/modules/services/policykit.te      |    2 -
 policy/modules/services/portmap.te        |    1 -
 policy/modules/services/postfix.te        |   57 +++++++++---------
 policy/modules/services/postfixpolicyd.te |    6 +-
 policy/modules/services/postgresql.te     |   14 ++--
 policy/modules/services/ppp.te            |   16 +++---
 policy/modules/services/prelude.te        |    5 +-
 policy/modules/services/privoxy.te        |    8 +-
 policy/modules/services/procmail.te       |    2 +-
 policy/modules/services/puppet.te         |   12 ++--
 policy/modules/services/pyzor.te          |   91 +++++++++++++----------------
 policy/modules/services/qmail.te          |   32 +++++-----
 policy/modules/services/qpidd.te          |    4 +-
 27 files changed, 156 insertions(+), 185 deletions(-)
---