Null-Merge commit '2b621b6' into cg_merges_20131108a

Conflicts:
	Makefile.am
	README
	README.GPU
	adl.c
	adl.h
	adl_functions.h
	configure.ac
	driver-avalon.c
	driver-avalon.h
	driver-bitforce.c
	driver-icarus.c
	driver-modminer.c
	driver-opencl.c
	driver-opencl.h
	findnonce.c
	findnonce.h
	miner.c
	miner.h
	ocl.c
	ocl.h
	phatk121016.cl
	usbutils.c