From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 7 Feb 2012 20:36:03 +0000 (+0100)
Subject: Merge commit 'v40'
X-Git-Tag: 43-1~51^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01857731f2aca4ad4fe8b6a4637ed1615841e68d;p=systemd

Merge commit 'v40'
---

01857731f2aca4ad4fe8b6a4637ed1615841e68d