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

diff --cc policy/modules/services/networkmanager.te
index cd5c9745b82cceb8db3c6519386d1af8b58b1402,f4a85dca703f28a3aff008cc47fbf8fcccd3dfc2..a5f9de0607be7999147228371e15c5d0ced2c639
--- 1/policy/modules/services/networkmanager.te
--- 2/policy/modules/services/networkmanager.te
+++ b/policy/modules/services/networkmanager.te
@@@ -207,8 -207,8 +207,9 @@@ optional_policy(
        init_dbus_chat(NetworkManager_t)
  
        optional_policy(`
+               consolekit_read_pid_file(NetworkManager_t)
                consolekit_dbus_chat(NetworkManager_t)
 +              consolekit_read_pid_files(NetworkManager_t)
        ')
  ')