Null-Merge commit '4c9f2b7' into cg_merges_20130524b

Conflicts:
	Makefile.am
	NEWS
	README
	configure.ac
	driver-bitforce.c
	driver-modminer.c
	miner.h
	usbutils.c
	usbutils.h
	util.c
	util.h