From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 21 Apr 2011 11:07:58 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 25-1~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eed39912bf7f496c893d5ee1eb9b15e58264fe30;p=systemd

Merge branch 'master' into debian
---

eed39912bf7f496c893d5ee1eb9b15e58264fe30