From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 23 Sep 2011 17:27:55 +0000 (+0200)
Subject: Merge commit 'v36'
X-Git-Tag: 36-1~4^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baf8bb13719693fbc4be438dd3c358f2f9d861cd;p=systemd

Merge commit 'v36'
---

baf8bb13719693fbc4be438dd3c358f2f9d861cd