Merge branch 'dev' of master.kernel.org:/pub/scm/utils/kernel/module-init-tools/module-init-tools into dev

Conflicts:
	ChangeLog

Signed-off-by: Jon Masters <jcm@jonmasters.org>