Merge commit 'a5b3824' into bfgminer

Conflicts:
	miner.c

miner.c

@@ -2627,7 +2627,7 @@ static char *submit_upstream_work_request(struct work *work)
 	if (work->tmpl) {
 		unsigned char data[80];
 		swap32yes(data, work->data, 80 / 4);
-		json_t *req = blkmk_submit_jansson(work->tmpl, data, work->dataid, *((uint32_t*)&work->data[76]));
+		json_t *req = blkmk_submit_jansson(work->tmpl, data, work->dataid, le32toh(*((uint32_t*)&work->data[76])));
 		s = json_dumps(req, 0);
 		json_decref(req);
 		sd = bin2hex(data, 80);