Merge commit '185cac3' into cg_merges_20130606a

Conflicts:
	miner.c

deviceapi.c

@@ -577,6 +577,7 @@ void *miner_thread(void *userdata)
 		drv->minerloop(mythr);
 	else
 		minerloop_scanhash(mythr);
+	cgpu->deven = DEV_DISABLED;
 
 out:
 	if (drv->thread_shutdown)

miner.c

@@ -7321,6 +7321,7 @@ void hash_queued_work(struct thr_info *mythr)
 				drv->flush_work(cgpu);
 		}
 	}
+	// cgpu->deven = DEV_DISABLED; set in miner_thread
 }
 
 void mt_disable_finish(struct thr_info *mythr)