fixing problems caused by bad merge from upstream

	modified:   fabfile.py
	modified:   templates/describeproc.xml
	modified:   templates/getcaps.xml