Null-Merge commit '13e19de' into cg_merges_20130513

Assumes Litecoin difficulty measurement, so we're better off rewriting it if it's ever needed

Conflicts:
	driver-opencl.c
	miner.c
	miner.h