Fixes #4903: Bundle CFEngine manpages with rudder-agent
Merge pull request #555 from Kegeruneku/bug_4903/int/4903_bundle_cfengine_manpages

Fixes #4903: Bundle CFEngine manpages with rudder-agent
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
Fixes #5944: Correct a broken merge ( <<<<<< HEAD tags found in merged file )
Merge pull request #558 from Kegeruneku/bug_5944/int/5944_correct_broken_merge

Fixes #5944: Correct a broken merge ( <<<<<< HEAD tags found in merged f...
Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge pull request #560 from Kegeruneku/bug_5936/int/5936_correct_debian_5_tckdb_patch

Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/patch-DEBIAN_5-compile-tokyocabinet.patch
Fixes #5984: Build error on RPM due to man pages being included twice

We do not need to include any files from %{rudderdir} in the %files
section of the .spec file, because they are included automatically (see
the comment just before the start of the %files section)
Merge pull request #564 from jooooooon/bug_5984/build_error_on_rpm_due_to_man_pages_being_included_twice

Fixes #5984: Build error on RPM due to man pages being included twice
Merging 2.10 into 2.11