From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 29 Apr 2016 18:27:23 +0000 (-0400)
Subject: Merge pull request #3151 from keszybz/pr3149-2
X-Git-Tag: v230~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26ccc1d0875b0e0c4306b03a52aff712c23d46c7;p=thirdparty%2Fsystemd.git

Merge pull request #3151 from keszybz/pr3149-2

 Assorted fixes #3149 + one commit tacked on top
---

26ccc1d0875b0e0c4306b03a52aff712c23d46c7