From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 29 Jun 2011 11:52:32 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 29-1~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8fb40cecfd572a82aca7a753de7fcdff1192046;p=systemd

Merge branch 'master' into debian
---

c8fb40cecfd572a82aca7a753de7fcdff1192046