From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 22 Jul 2016 07:10:04 +0000 (+0200)
Subject: Merge pull request #3764 from poettering/assorted-stuff-2
X-Git-Tag: v231~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c3c778014f4c59dd97f31ca5ab2e7374f08bbf6;p=thirdparty%2Fsystemd.git

Merge pull request #3764 from poettering/assorted-stuff-2

Assorted fixes
---

5c3c778014f4c59dd97f31ca5ab2e7374f08bbf6