From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 1 Jul 2012 06:35:10 +0000 (+0200)
Subject: Merge branch 'upstream-fixes' into debian
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ffa15f4bb890176a265712d37e3d624b9fb365;p=systemd

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

b3ffa15f4bb890176a265712d37e3d624b9fb365