Merge commit 'v13'

diff --cc Makefile.am
index 29ca9f08178b7a633b5406efd43cca593e237dc8,e1f6fe058e7a10ef42bab874eb76916d4ea38211..0d552e51d6cea065d5fa743c7a0d45b7ebe48a3b
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -266,40 -332,9 +332,16 @@@ dist_systemunit_DATA += 
        units/fedora/plymouth-poweroff.service \
        units/fedora/plymouth-halt.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_DEBIAN
- dist_systemunit_DATA += \
-       units/debian/halt.service \
-       units/debian/killall.service \
-       units/debian/poweroff.service \
-       units/debian/reboot.service \
-       units/debian/fsck.target \
-       units/debian/umountfs.service \
-       units/debian/umountnfs.service \
-       units/debian/umountroot.service
- endif
- 
- if TARGET_SUSE
- dist_systemunit_DATA += \
-       units/suse/halt.service \
-       units/suse/poweroff.service \
-       units/suse/reboot.service \
-       units/suse/fsck.target
- endif
- 
  if TARGET_GENTOO
  dist_systemunit_DATA += \
-       units/gentoo/halt.service \
-       units/gentoo/killall.service \
-       units/gentoo/poweroff.service \
-       units/gentoo/reboot.service \
        units/gentoo/xdm.service
  endif
  

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