Tree-Merge commit 'ee2a5ae' into cg_merges_20130822a

Conflicts:
	driver-avalon.c
	driver-bflsc.c
	driver-bitforce.c
	driver-modminer.c
	driver-ztex.c
	libztex.c
	miner.c
	usbutils.c
	util.c
	util.h