From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Jul 2011 20:39:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'harald/master'
X-Git-Tag: v30~28
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e2bb92dcae6ee785ff7462aadc8c369fd93715b;p=systemd

Merge remote-tracking branch 'harald/master'
---

7e2bb92dcae6ee785ff7462aadc8c369fd93715b