Null-Merge commit '48d91c7' into cg_merges_20130818a

Conflicts:
	ASIC-README
	NEWS
	README
	configure.ac
	driver-avalon.c
	driver-bflsc.h
	miner.c
	usbutils.c
	util.c
	util.h