From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 8 Jun 2011 14:14:10 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 29-1~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565702f889d5601ce500e77082cb32f6b459139c;p=systemd

Merge branch 'master' into debian
---

565702f889d5601ce500e77082cb32f6b459139c