Merge pull request #1033 from poettering/machine-fixes
authorTom Gundersen <teg@jklm.no>
Tue, 25 Aug 2015 16:50:44 +0000 (18:50 +0200)
committerTom Gundersen <teg@jklm.no>
Tue, 25 Aug 2015 16:50:44 +0000 (18:50 +0200)
misc machine fixes


Trivial merge