From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 11 Mar 2011 18:11:53 +0000 (+0100)
Subject: Merge commit 'v20'
X-Git-Tag: 20-1~9^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0978508eb4c15a1846e5ef25a0cb9091c72906e0;p=systemd

Merge commit 'v20'
---

0978508eb4c15a1846e5ef25a0cb9091c72906e0