Bugfix: Prefer using a non-frozen mining thread for watchdog
Merge commit '7d544d9' into bfgminer

Conflicts:
	cgminer.c