From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 2 Apr 2012 19:05:22 +0000 (+0200)
Subject: Merge branch 'upstream-fixes' into debian
X-Git-Tag: 44-1~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34bec78e667a7b0ca8b6b7d531f128e2c488a1b3;p=systemd

Merge branch 'upstream-fixes' into debian
---

34bec78e667a7b0ca8b6b7d531f128e2c488a1b3