Fixing drup/drat
Merge branch 'master' of github.com:msoos/cryptominisat

Conflicts:
	scripts/regression_test.py