From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 13 Feb 2011 07:27:49 +0000 (+0100)
Subject: Merge commit 'v17'
X-Git-Tag: 17-1~10^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0403ec5c41db9c68f387dab36e2b08651a321abc;p=systemd

Merge commit 'v17'
---

0403ec5c41db9c68f387dab36e2b08651a321abc