Null-Merge commit 'd71e9f9' into cg_merges_20130818a

Conflicts:
	ASIC-README
	Makefile.am
	README.RPC
	api.c
	driver-avalon.c
	driver-avalon.h
	driver-bflsc.c
	miner.c