prp-fp defun magic
Merge branch 'master' of https://github.com/donlindsay/mx-org-rl

Conflicts:
	ow2-rl-axioms.org