Merge commit 'e26691c' into bfgminer

Conflicts:
	main.c

miner.c

@@ -1287,6 +1287,9 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITH_ARG("--scan-time|-s",
 		     set_int_0_to_9999, opt_show_intval, &opt_scantime,
 		     "Upper bound on time spent scanning current work, in seconds"),
+	OPT_WITH_ARG("--scantime",
+		     set_int_0_to_9999, opt_show_intval, &opt_scantime,
+		     opt_hidden),
 	OPT_WITH_ARG("--sched-start",
 		     set_schedtime, NULL, &schedstart,
 		     "Set a time of day in HH:MM to start mining (a once off without a stop time)"),