Fixes #4644: Cannot upgrade from 2.9.2 to 2.9.4 due to an error on '/etc/logrotate.d/rudder'
Fixes #4387: Upgrade rudder-server-root 2.9.1 to 2.9.2 fails on rudder-agent on Ubuntu 12.04 LTS
Fixes #5467: implement openvz support for rudder 2.11
Merge pull request #470 from peckpeck/bug_5467/implement_openvz_support_for_rudder_2_11

Fixes #5467: implement openvz support for rudder 2.11
Fixes #5477: implement openvz support for rudder 2.11
Fixes #5476: Apply patch about oracle linux OS name in fusion
Merge pull request #472 from VinceMacBuche/bug_5476/patch_oracle_linux

Fixes #5476: Apply patch about oracle linux OS name in fusion
Fixes #5464: Make the rudder-upgrade script able to report errors intead of silently failing
Merge pull request #469 from Kegeruneku/bug_5464/int/5464_make_the_rudder_upgrade_script_more_verbose

Fixes #5464: Make the rudder-upgrade script able to report errors intead...
Merge pull request #473 from peckpeck/bug_5477/implement_openvz_support_for_rudder_2_11

Fixes #5477: implement openvz support for rudder 2.11
rudder-agent/SOURCES/vzps.py: Act as ps if no CTID is given and just output the complete process table
Fixes #5470: do not add root roles into ldap
Merge pull request #476 from ncharles/bug_5470/do_not_add_root_roles_into_ldap

Fixes #5470: do not add root roles into ldap
Merge pull request #462 from jooooooon/bug_4387/upgrade_rudder_server_root_2_9_1_to_2_9_2_fails_on_rudder_agent_on_ubuntu_12_04_lts

Fixes #4387: Don't fail on rudder-agent stop, force stop if necessary
Change the logic to have positive named value
Fixes #5419: correct the version comparision for FusionInventory
Merge pull request #467 from ncharles/bug_5419/int/correct_verson_comparision

Fixes #5419: correct the version comparision for FusionInventory
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11