Null-Merge commit '44ec755' into cg_updates_20130512

Conflicts:
	FPGA-README
	Makefile.am
	README
	api.c
	configure.ac
	driver-bitforce.c
	miner.h
	usbutils.c
	usbutils.h