Null-Merge commit 'ef8efd6' into cg_merges_20131108a

Conflicts:
	Makefile.am
	api.c
	configure.ac
	driver-bitfury.c
	driver-icarus.c
	driver-modminer.c
	driver-ztex.c
	libztex.c
	libztex.h
	miner.c
	miner.h
	usbutils.c
	usbutils.h
	util.c
	util.h