From: Tom Gundersen <teg@jklm.no>
Date: Tue, 25 Aug 2015 16:50:44 +0000 (+0200)
Subject: Merge pull request #1033 from poettering/machine-fixes
X-Git-Tag: v225~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c1c9745ccc478c8eda72f8bae76945487076ae;p=thirdparty%2Fsystemd.git

Merge pull request #1033 from poettering/machine-fixes

misc machine fixes
---

33c1c9745ccc478c8eda72f8bae76945487076ae