Null-Merge commit '178c9a0' into cg_merges_20131108a

Conflicts:
	01-cgminer.rules
	Makefile.am
	api.c
	configure.ac
	driver-bitfury.c
	miner.c
	miner.h
	usbutils.c
	usbutils.h
	util.c
	util.h