Merge remote branch 'origin/master'

diff --cc Makefile.am
Simple merge

diff --cc units/getty@.service.m4
index a302bf9722180d7eb6c54eed43b3a42267c7313b,f1f7f326304b9e12777755f49883665643688cd5..ef52e0b4961444052ca1235b16665e2393cfc641
--- 1/units/getty@.service.m4
--- 2/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@@ -7,8 -7,9 +7,9 @@@
  
  m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
  m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
 -m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
 +m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400 %I')')m4_dnl
  m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
+ m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl
  m4_dnl
  [Unit]
  Description=Getty on %I

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