Back-out merge.
Back-out merge.

--HG--
extra : convert_revision : bc9e6aea00009368382162201d540aebfc203539

stevenraspudic/resource-agents,asp24/resource-agents,asp24/resource-agents,stevenraspudic/resource-agents,asp24/resource-agents,stevenraspudic/resource-agents