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

Merge branch 'master' into debian

Conflicts:
	units/var-lock.mount
---

fc04e91b7db89d95918658aeaf20296e06b4ea95