From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 2 Nov 2011 13:08:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'zbigniew/systemadm_changes'
X-Git-Tag: v38~206
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=263653e10353d8ad155f1faba01981816a2bb712;p=systemd

Merge remote-tracking branch 'zbigniew/systemadm_changes'
---

263653e10353d8ad155f1faba01981816a2bb712