From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 17 Aug 2010 08:45:08 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 8-2~16
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c0046fc946438554b23544c1f04c5dcb04da3c5;p=systemd

Merge branch 'master' into debian
---

3c0046fc946438554b23544c1f04c5dcb04da3c5