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