From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 14 Jul 2010 18:01:40 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 8-2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4574f5ae9532e3e4daabb11c16c068eb861aaf80;p=systemd

Merge branch 'master' into debian
---

4574f5ae9532e3e4daabb11c16c068eb861aaf80