From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 21 Apr 2011 10:53:30 +0000 (+0200)
Subject: Merge commit 'v25'
X-Git-Tag: 25-1~8^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7447e99bfac0c0b7df1f0dc0211ea59317230801;p=systemd

Merge commit 'v25'
---

7447e99bfac0c0b7df1f0dc0211ea59317230801