Merge commit '03f98e2' into cg_merges_20130524b

scrypt.c

@@ -434,7 +434,7 @@ int scrypt_test(unsigned char *pdata, const unsigned char *ptarget, uint32_t non
 	scrypt_1024_1_1_256_sp(data, scratchbuf, ohash);
 	tmp_hash7 = be32toh(ohash[7]);
 
-	applog(LOG_DEBUG, "harget %08lx diff1 %08lx hash %08lx",
+	applog(LOG_DEBUG, "htarget %08lx diff1 %08lx hash %08lx",
 				(long unsigned int)Htarg,
 				(long unsigned int)diff1targ,
 				(long unsigned int)tmp_hash7);