Merge branch 'quanta'

Conflicts:
	bin/Makefile.am
	bin/Makefile.in

bin/Makefile.am

@@ -55,7 +55,7 @@ bin_SCRIPTS = agmrancid alogin arancid arrancid avologin avorancid blogin \
 	htlogin htrancid jerancid jlogin jrancid mrancid mrvlogin mrvrancid \
 	mtlogin mtrancid nlogin nrancid nslogin nsrancid nxrancid par prancid \
 	rancid-fe rancid rivlogin rivrancid rrancid srancid tlogin tntlogin \
-	tntrancid trancid xrancid xrrancid zrancid dlogin drancid
+	tntrancid trancid xrancid xrrancid zrancid dlogin drancid qlogin qrancid
 
 bin_SCRIPTS += lg.cgi lgform.cgi rancid-cvs rancid-run control_rancid
 EXTRA_DIST= lg.cgi.in lgform.cgi.in rancid-cvs.in rancid-run.in control_rancid.in

bin/Makefile.in

@@ -60,6 +60,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/mtrancid.in $(srcdir)/nlogin.in $(srcdir)/nrancid.in \
 	$(srcdir)/nslogin.in $(srcdir)/nsrancid.in \
 	$(srcdir)/nxrancid.in $(srcdir)/par.in $(srcdir)/prancid.in \
+	$(srcdir)/qlogin.in $(srcdir)/qrancid.in \
 	$(srcdir)/rancid-fe.in $(srcdir)/rancid.in \
 	$(srcdir)/rivlogin.in $(srcdir)/rivrancid.in \
 	$(srcdir)/rrancid.in $(srcdir)/srancid.in $(srcdir)/tlogin.in \
@@ -80,7 +81,7 @@ CONFIG_CLEAN_FILES = control_rancid par rancid-fe agmrancid alogin \
 	htrancid jlogin jrancid jerancid mrancid mrvlogin mrvrancid \
 	mtrancid mtlogin nlogin nrancid nslogin nsrancid nxrancid \
 	prancid rivlogin rivrancid rrancid srancid tlogin tntlogin \
-	tntrancid trancid xrancid xrrancid zrancid dlogin drancid
+	tntrancid trancid xrancid xrrancid zrancid dlogin drancid qlogin qrancid
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -254,7 +255,7 @@ bin_SCRIPTS = agmrancid alogin arancid arrancid avologin avorancid \
 	nrancid nslogin nsrancid nxrancid par prancid rancid-fe rancid \
 	rivlogin rivrancid rrancid srancid tlogin tntlogin tntrancid \
 	trancid xrancid xrrancid zrancid lg.cgi lgform.cgi rancid-cvs \
-	rancid-run dlogin drancid
+	rancid-run dlogin drancid qlogin qrancid
 EXTRA_DIST = lg.cgi.in lgform.cgi.in rancid-cvs.in rancid-run.in
 #dist_bin_SCRIPTS= $(bin_SCRIPTS:%=%.in)
 CLEANFILES = lg.cgi lgform.cgi rancid-cvs rancid-run
@@ -411,6 +412,10 @@ nxrancid: $(top_builddir)/config.status $(srcdir)/nxrancid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 prancid: $(top_builddir)/config.status $(srcdir)/prancid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+qlogin: $(top_builddir)/config.status $(srcdir)/qlogin.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+qrancid: $(top_builddir)/config.status $(srcdir)/qrancid.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 rivlogin: $(top_builddir)/config.status $(srcdir)/rivlogin.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 rivrancid: $(top_builddir)/config.status $(srcdir)/rivrancid.in