From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 29 Jul 2010 12:31:08 +0000 (+0200)
Subject: Merge commit 'v4'
X-Git-Tag: 8-2~20^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17754a57220c3ea7fcee2579d6a2db3a19131fd1;p=systemd

Merge commit 'v4'
---

17754a57220c3ea7fcee2579d6a2db3a19131fd1