Null-Merge commit '951ec31' into cg_merges_20130818a

Conflicts:
	ASIC-README
	FPGA-README
	NEWS
	README
	api.c
	configure.ac
	driver-avalon.c
	driver-avalon.h
	driver-bflsc.c
	driver-icarus.c
	driver-modminer.c
	miner.c
	usbutils.c
	usbutils.h