From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 7 Jul 2010 20:02:36 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 8-2~25
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dbc7e6bb98b330c813a897810b8b96246f138bc;p=systemd

Merge branch 'master' into debian
---

1dbc7e6bb98b330c813a897810b8b96246f138bc