Merge branch 'bfgminer' of github.com:corrideat/bfgminer into bfgminer
Updated miner.c
Merge branch 'bfgminer' of github.com:corrideat/bfgminer into bfgminer

Conflicts:
	miner.c