Null-Merge commit '41e6f48' into cg_merges_20130602

Conflicts:
	01-cgminer.rules
	ASIC-README
	FPGA-README
	Makefile.am
	README
	configure.ac
	driver-bflsc.c
	driver-bitforce.c
	driver-icarus.c
	driver-ztex.c
	miner.c
	usbutils.c
	usbutils.h