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 branch 'branches/rudder/2.11'