Merge pull request #2576 from poettering/random-fixes
authorMartin Pitt <martin.pitt@ubuntu.com>
Thu, 11 Feb 2016 12:29:53 +0000 (13:29 +0100)
committerMartin Pitt <martin.pitt@ubuntu.com>
Thu, 11 Feb 2016 12:29:53 +0000 (13:29 +0100)
Random fixes


Trivial merge