From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 17 May 2010 21:36:54 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 0.git+20100605+dfd8ee-1~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff34f09ba70af665b22abed89a48debdd75fca26;p=systemd

Merge branch 'master' into debian
---

ff34f09ba70af665b22abed89a48debdd75fca26