Null-Merge commit '36ba21e' into cg_merges_20130606a

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