Null-Merge commit '9287ee9' into cg_merges_20130619a

Conflicts:
	ASIC-README
	FPGA-README
	NEWS
	api.c
	driver-avalon.c
	driver-bflsc.c
	driver-bitforce.c
	driver-icarus.c
	driver-modminer.c
	driver-opencl.c
	miner.c
	usbutils.c
	usbutils.h
	util.c