Merge commit 'f63aeab' into bfgminer

No net effect, since BFGMiner doesn't average stuff...

Conflicts:
	driver-opencl.c

miner.c

@@ -4665,6 +4665,7 @@ void *miner_thread(void *userdata)
 		if (api->free_work && likely(work->pool))
 			api->free_work(mythr, work);
 		get_work(work, mythr, thr_id);
+		cgpu->new_work = true;
 
 		gettimeofday(&tv_workstart, NULL);
 		work->blk.nonce = 0;

miner.h

@@ -411,6 +411,8 @@ struct cgpu_info {
 	double gpu_us_average;
 #endif
 
+	bool new_work;
+
 	float temp;
 	int cutofftemp;