hg: branch merge
hg: branch merge

--HG--
extra : convert_revision : 3831115381136a0412d44a6ec34eac01c3d4b3ef

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