From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 27 Feb 2012 21:40:17 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 43-1~31
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fe9b9c9a74b45686ac6a62796c1b7a7b8b799a;p=systemd

Merge branch 'master' into debian
---

a8fe9b9c9a74b45686ac6a62796c1b7a7b8b799a