Merge commit 'v3'

diff --cc Makefile.am
index e218cea29e40e565f38fe7481d0cbe7cce810f0f,ff8e847bbefe7562e4f95aab9cbf4872799d4fd5..ab61bfebc718c9a9563b5f670d6d5f6204cb6ace
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -182,15 -186,9 +186,16 @@@ dist_systemunit_DATA += 
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/reboot.service \
-       units/fedora/sysinit.service
+       units/fedora/sysinit.service \
+       units/fedora/single.service
  endif
 +if TARGET_DEBIAN
 +dist_systemunit_DATA += \
 +      units/debian/halt.service \
 +      units/debian/killall.service \
 +      units/debian/poweroff.service \
 +      units/debian/reboot.service
 +endif
  
  if TARGET_SUSE
  dist_systemunit_DATA += \

diff --cc units/multi-user.target.m4
Simple merge