From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 3 Feb 2010 11:40:29 +0000 (+0100)
Subject: Merge remote branch 'kay/master'
X-Git-Tag: 0.git+20100605+dfd8ee-1~328
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911081dde7ec28b28bfed7e08ab901158c18712d;p=systemd

Merge remote branch 'kay/master'
---

911081dde7ec28b28bfed7e08ab901158c18712d