From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 17 Feb 2011 06:35:58 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 19-1~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae142275fc545fe2a44eecdd253f75b3fe33dae;p=systemd

Merge branch 'master' into debian
---

7ae142275fc545fe2a44eecdd253f75b3fe33dae