Merge commit '149781c' into cg_merges_20121115

Conflicts:
	miner.c

miner.c

@@ -126,7 +126,7 @@ const int opt_cutofftemp = 95;
 int opt_hysteresis = 3;
 static int opt_retries = -1;
 int opt_fail_pause = 5;
-int opt_log_interval = 3;
+int opt_log_interval = 5;
 int opt_queue = 1;
 int opt_scantime = 60;
 int opt_expiry = 120;