pending commmit
Merge branch 'master' of github.com-oleweidner:saga-project/radical.agent

Conflicts:
	setup.py