Automatic commit of package [pulp] release [2.5.1-0.2.beta].
Automatic commit of package [pulp-nodes] release [2.5.1-0.2.beta].
Merge branch '2.5-testing' into 2.6-dev

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec
	rel-eng/packages/pulp
	rel-eng/packages/pulp-nodes