Null-Merge commit '291df91' into cg_merges_20130619a

Conflicts:
	README
	driver-avalon.c
	driver-bflsc.c
	driver-bitforce.c
	driver-icarus.c
	driver-modminer.c
	usbutils.c
	usbutils.h