From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 26 Dec 2010 12:01:22 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 16-1~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaff12368d46c22f22afe80793e8e7071a9c023f;p=systemd

Merge branch 'master' into debian
---

aaff12368d46c22f22afe80793e8e7071a9c023f