Finished configuration scripts.
Merge branch 'master' of https://github.com/plsm/mercury-utils

Conflicts:
	Makefile.in