Conflicts:
	darshan-log-format.h
	darshan-runtime/Makefile.in
	darshan-util/Makefile.in
	darshan-util/darshan-logutils.h