Fixes #4942: add migration script for LDAP entries for Server Role management
Fixes #4915: Force existence of policy_server.dat file
Merge pull request #338 from ncharles/bug_4915/int/force_existance_of_policy_server_dat

Fixes #4915: Force existence of policy_server.dat file
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #4948: Add PAM development headers as a dependency for rudder-agent
Merge pull request #343 from Kegeruneku/bug_4948/int/4948_add_libpam_deps_to_rudder_agent

Fixes #4948: Add PAM development headers as a dependency for rudder-agen...
Fixes #4951: Add an explicit dependency against TokyoCabinet on AIX rudder-agent RPM's
Merge pull request #345 from Kegeruneku/bug_4951/int/4951_add_tokyocabinet_dependency_to_aix_rudder_agent_rpm

Fixes #4951: Add an explicit dependency against TokyoCabinet on AIX rudd...
Fixes #4688: don't check age of timestamp if if disable-agent file is set
Merge pull request #344 from ncharles/bug_4688/int/don_t_check_db_if_disable_agent

Fixes #4688: don't check age of timestamp if if disable-agent file is se...
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10

Conflicts:
	rudder-agent/SOURCES/check-rudder-agent
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #4956: Patch on debian 5 cannot be applied on debian/rules
Merge pull request #346 from VinceMacBuche/bug_4956/fix_rudder-agent_patch

Fixes #4956: Patch on debian 5 cannot be applied on debian/rules
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/patch-DEBIAN_5-compile-tokyocabinet.patch
Merge pull request #341 from ncharles/ust_4928/int/4942_migration_script_for_server_roles

Ust 4928/int/4942 migration script for server roles