From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 29 Jun 2012 20:38:09 +0000 (+0200)
Subject: Merge branch 'master' into upstream-fixes
X-Git-Tag: upstream-fixes_44-3~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d70785fbef24d86cf19e7196f7ad90c699965b60;p=systemd

Merge branch 'master' into upstream-fixes
---

d70785fbef24d86cf19e7196f7ad90c699965b60