Null-Merge commit 'f6e475d' into cg_merges_20131023a

Conflicts:
	01-cgminer.rules
	api-example.c
	configure.ac
	driver-avalon.c
	driver-avalon.h
	driver-bflsc.c
	driver-bitforce.c
	driver-bitfury.c
	driver-bitfury.h
	driver-icarus.c
	miner.c
	miner.h
	usbutils.c
	usbutils.h
	util.c
	util.h