Merge remote branch 'origin/master'

diff --cc Makefile.am
index 53f485e05bc1c9cd2395c356a33f3328a53ce434,28e52fee2fa7d709b7045e08bbadf2118f245311..a1c08364d9fd9ba3d002a6517d433314d9a0d2a8
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -155,14 -159,14 +159,21 @@@ dist_systemunit_DATA += 
        units/fedora/reboot.service \
        units/fedora/sysinit.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 += \
+       units/suse/halt.service \
+       units/suse/poweroff.service \
+       units/suse/reboot.service
+ endif
+ 
  if TARGET_GENTOO
  dist_systemunit_DATA += \
        units/gentoo/halt.service \

diff --cc units/getty@.service.m4
Simple merge