oops
Merge branch 'master' of git://github.com/leifj/pyFF

Conflicts:
	src/pyff/utils.py