Merge commit 'd5b3f55' into cg_merges_20131108a

Conflicts:
	driver-klondike.c

driver-klondike.c

@@ -460,7 +460,7 @@ static void *klondike_get_replies(void *userdata)
 
 		err = usb_read(klncgpu, replybuf+1, REPLY_SIZE, &recd);
 		if (!err && recd == REPLY_SIZE) {
-			if (opt_log_level <= LOG_DEBUG) {
+			if (opt_log_level <= READ_DEBUG) {
 				char hexdata[(recd * 2) + 1];
 				bin2hex(hexdata, &replybuf[1], recd);
 				applog(READ_DEBUG, "%s (%s) reply [%s:%s]", klncgpu->drv->dname, klncgpu->device_path, replybuf+1, hexdata);