Index: trunk/tools/tracemerge/tracemerge.c
===================================================================
--- trunk/tools/tracemerge/tracemerge.c	(revision 903)
+++ trunk/tools/tracemerge/tracemerge.c	(revision 1075)
@@ -97,5 +97,5 @@
 		uint64_t oldest_ts=0;
 		int oldest=-1;
-		for(i=0;i<argc-2;++i) {
+		for(i=0;i<argc-optind;++i) {
 			if (!live[i] && input[i]) {
 				int ret=trace_read_packet(input[i],packet[i]);