Merge branch 'ldap_timeout' of github.com:llaurent/resource-agents; branch 'master' of git://github.com/ClusterLabs/resource-agents into my_fixes
Merge branch 'RA_323' of github.com:llaurent/resource-agents into my_fixes
Merge branch 'debian_bug_675913' of github.com:llaurent/resource-agents into my_fixes