Null-Merge commit 'bad942e' into cg_updates_20130512

Conflicts:
	api.c
	driver-bitforce.c
	driver-cpu.c
	driver-icarus.c
	driver-modminer.c
	driver-opencl.c
	driver-ztex.c
	findnonce.c
	fpgautils.c
	fpgautils.h
	miner.c
	miner.h
	usbutils.c
	usbutils.h