Null-Merge commit '5a13ad4' into cg_merges_20130606b

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