Null-Merge commit '4a620cc' into cg_merges_20131108a

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