From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 29 Jul 2010 13:47:23 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 8-2~20
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94cb3f9a6e041ce4b372fb0bb614e0073e25a4a3;p=systemd

Merge branch 'master' into debian
---

94cb3f9a6e041ce4b372fb0bb614e0073e25a4a3