Null-Merge commit '581afcf' into cg_merges_20130818a

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