Null-Merge commit 'addb848' into cg_merges_20131108a

Conflicts:
	NEWS
	configure.ac
	driver-avalon.c
	driver-avalon.h
	driver-bflsc.c
	miner.c
	usbutils.c
	usbutils.h