From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 2 Apr 2012 18:16:01 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 44-1~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a09456945b6f1ccb4c006c9440f24d0076516208;p=systemd

Merge branch 'master' into debian
---

a09456945b6f1ccb4c006c9440f24d0076516208