Fixes #5941: Synchronize rudder-agent with rudder-agent-thin
Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge pull request #559 from Kegeruneku/bug_5941/int/5941_synchronise_agent_with_agent_thin

Fixes #5941: Synchronize rudder-agent with rudder-agent-thin
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
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0