From: Tom Gundersen <teg@jklm.no>
Date: Wed, 11 Nov 2015 01:31:29 +0000 (+0100)
Subject: Merge pull request #1837 from poettering/grabbag2
X-Git-Tag: v228~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7042fc14ff2bd30648aea6602c95d3cf6946e7be;p=thirdparty%2Fsystemd.git

Merge pull request #1837 from poettering/grabbag2

variety of fixes
---

7042fc14ff2bd30648aea6602c95d3cf6946e7be