Fixes #4156: correct the command to restart rsyslog on Fedora
Fixes #4262: Add local addresses to authorized connections
Fixes #4241: add carriage returns in the list of nodes for cf-serverd
Merge pull request #254 from VinceMacBuche/bug/4262/add_local_ip_to_authorized_networks

Fixes #4262: Add local addresses to authorized connections
Merge pull request #252 from ncharles/bug_4241/bug/too_many_servers_causes_error_in_cf_serverd

Fixes #4241: add carriage returns in the list of nodes for cf-serverd
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9
Fixes #4227: A Xen Hypervisor on SLES does not make a valid inventory and can't be accepted into Rudder since binary path to xenstore is wrong on SLES 11 and does not exist on SLES 10
Merge pull request #257 from jooooooon/bug_4227/a_xen_hypervisor_on_sles_does_not_make_a_valid_inventory_and_can_t_be_accepted_into_rudder_since_binary_path_to_xenstore_is_wrong_on_sles_11_and_does_not_exist_on_sles_10

Fixes #4227: A Xen Hypervisor on SLES does not make a valid inventory an...
Refs #3293: initial commit for section edition
Fixes #3293: add possibility to enforce content of section
Merge pull request #256 from ncharles/bug_3293/dev/enforce_content_of_section

Bug 3293/dev/enforce content of section
Revert "Merge pull request #256 from ncharles/bug_3293/dev/enforce_content_of_section"

This reverts commit 91d286af394017d2a20e31c7e1157f540c20c39d, reversing
changes made to 358c2250e9f03df10469e6171aba5ff651ad250b.
Refs 3293: initial commit
Fixes #3293: add possibility to striclty enforce content of section in file
Merge pull request #258 from ncharles/bug_3293/dev/add_possibility_to_enforce_content_of_section

Bug 3293/dev/add possibility to enforce content of section
Merge pull request #241 from ncharles/bug_4156/dev/correct_syslog_restart_on_fedora

Fixes #4156: correct the command to restart rsyslog on Fedora
Merging 2.4 into 2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
correct merge error
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7